From 27b6d839741d9af54790a3253d4a1d86cd08771b Mon Sep 17 00:00:00 2001
From: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>
Date: Sun, 28 Mar 2021 10:47:52 +0200
Subject: [PATCH] use named generic types in generate_solution_type (#2707)

* use named generic types in generate_solution_type

* "Update Substrate"

Co-authored-by: parity-processbot <>
---
 polkadot/Cargo.lock                  | 294 +++++++++++++--------------
 polkadot/runtime/kusama/src/lib.rs   |   7 +-
 polkadot/runtime/polkadot/src/lib.rs |   7 +-
 polkadot/runtime/westend/src/lib.rs  |   7 +-
 4 files changed, 161 insertions(+), 154 deletions(-)

diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index b59a1775fd3..55362d0a014 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -1,7 +1,5 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
 [[package]]
 name = "Inflector"
 version = "0.11.4"
@@ -1686,7 +1684,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1704,7 +1702,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "3.1.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1723,7 +1721,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1746,7 +1744,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1759,7 +1757,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1775,7 +1773,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1786,7 +1784,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1812,7 +1810,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -1824,7 +1822,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.0.0",
@@ -1836,7 +1834,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1846,7 +1844,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-metadata",
  "frame-support",
@@ -1867,7 +1865,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1884,7 +1882,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1898,7 +1896,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -1907,7 +1905,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4298,7 +4296,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
 [[package]]
 name = "pallet-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4314,7 +4312,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4329,7 +4327,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4353,7 +4351,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4368,7 +4366,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4383,7 +4381,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4400,7 +4398,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4415,7 +4413,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4436,7 +4434,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4452,7 +4450,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4474,7 +4472,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4490,7 +4488,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4510,7 +4508,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4527,7 +4525,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4541,7 +4539,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4557,7 +4555,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4571,7 +4569,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4587,7 +4585,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4609,7 +4607,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4625,7 +4623,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4638,7 +4636,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4653,7 +4651,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4669,7 +4667,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4689,7 +4687,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4705,7 +4703,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4719,7 +4717,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4743,7 +4741,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -4754,7 +4752,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4768,7 +4766,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4787,7 +4785,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4802,7 +4800,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4818,7 +4816,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4835,7 +4833,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -4846,7 +4844,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4862,7 +4860,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4878,7 +4876,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -7054,7 +7052,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "env_logger 0.8.2",
  "hex-literal",
@@ -7321,7 +7319,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7349,7 +7347,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
@@ -7372,7 +7370,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -7388,7 +7386,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7409,7 +7407,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -7420,7 +7418,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -7458,7 +7456,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "derive_more",
  "fnv",
@@ -7492,7 +7490,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -7522,7 +7520,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -7533,7 +7531,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "derive_more",
  "fork-tree",
@@ -7579,7 +7577,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
@@ -7603,7 +7601,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -7616,13 +7614,13 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
+ "async-trait",
  "futures 0.3.13",
  "futures-timer 3.0.2",
  "log",
  "parity-scale-codec",
- "parking_lot 0.11.1",
  "sc-client-api",
  "sc-telemetry",
  "sp-api",
@@ -7643,7 +7641,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "log",
  "sc-client-api",
@@ -7657,7 +7655,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "derive_more",
  "lazy_static",
@@ -7686,7 +7684,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -7702,7 +7700,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7717,7 +7715,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7735,7 +7733,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "derive_more",
  "dyn-clone",
@@ -7774,7 +7772,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7798,7 +7796,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-warp-sync"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
@@ -7819,7 +7817,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.13",
@@ -7837,7 +7835,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7857,7 +7855,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7876,7 +7874,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "async-std",
  "async-trait",
@@ -7929,7 +7927,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
@@ -7946,7 +7944,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7974,7 +7972,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "futures 0.3.13",
  "libp2p",
@@ -7987,7 +7985,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7996,7 +7994,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "futures 0.3.13",
  "hash-db",
@@ -8030,7 +8028,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
@@ -8054,7 +8052,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "futures 0.1.29",
  "jsonrpc-core",
@@ -8072,7 +8070,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "directories",
  "exit-future",
@@ -8135,7 +8133,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8150,7 +8148,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -8170,7 +8168,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "chrono",
  "futures 0.3.13",
@@ -8190,7 +8188,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -8217,7 +8215,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -8228,7 +8226,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
@@ -8250,7 +8248,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "futures 0.3.13",
  "futures-diagnose",
@@ -8666,7 +8664,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "log",
  "sp-core",
@@ -8678,7 +8676,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "hash-db",
  "log",
@@ -8695,7 +8693,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate 1.0.0",
@@ -8707,7 +8705,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8719,7 +8717,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -8732,7 +8730,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8744,7 +8742,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -8755,7 +8753,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8767,7 +8765,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "futures 0.3.13",
  "log",
@@ -8785,7 +8783,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "serde",
  "serde_json",
@@ -8794,7 +8792,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
@@ -8820,7 +8818,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -8841,7 +8839,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -8851,7 +8849,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8863,7 +8861,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8907,7 +8905,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -8916,7 +8914,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8926,7 +8924,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8937,7 +8935,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8954,7 +8952,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -8966,7 +8964,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "futures 0.3.13",
  "hash-db",
@@ -8990,7 +8988,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -9001,7 +8999,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -9018,7 +9016,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -9031,7 +9029,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -9042,7 +9040,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -9052,7 +9050,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "backtrace",
 ]
@@ -9060,7 +9058,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "serde",
  "sp-core",
@@ -9069,7 +9067,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -9090,7 +9088,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9107,7 +9105,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.0.0",
@@ -9119,7 +9117,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "serde",
  "serde_json",
@@ -9128,7 +9126,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9141,7 +9139,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -9151,7 +9149,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "hash-db",
  "log",
@@ -9173,12 +9171,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 
 [[package]]
 name = "sp-storage"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9191,7 +9189,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "log",
  "sp-core",
@@ -9204,7 +9202,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9217,7 +9215,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9230,7 +9228,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
@@ -9246,7 +9244,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -9260,7 +9258,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "futures 0.3.13",
  "futures-core",
@@ -9272,7 +9270,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9284,7 +9282,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9441,7 +9439,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -9467,7 +9465,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "platforms",
 ]
@@ -9475,7 +9473,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.13",
@@ -9498,7 +9496,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "async-std",
  "derive_more",
@@ -9512,7 +9510,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.13",
@@ -9540,7 +9538,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "futures 0.3.13",
  "substrate-test-utils-derive",
@@ -9550,7 +9548,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "quote",
@@ -10291,7 +10289,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 [[package]]
 name = "try-runtime-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
+source = "git+https://github.com/paritytech/substrate#505a8d6ae1e36b81220b7ac6999f99d14d2708af"
 dependencies = [
  "frame-try-runtime",
  "log",
diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
index 90cdeab6973..4de91f0a94f 100644
--- a/polkadot/runtime/kusama/src/lib.rs
+++ b/polkadot/runtime/kusama/src/lib.rs
@@ -321,8 +321,11 @@ parameter_types! {
 
 sp_npos_elections::generate_solution_type!(
 	#[compact]
-	pub struct NposCompactSolution16::<u32, u16, sp_runtime::PerU16>(16)
-	// -------------------- ^^ <NominatorIndex, ValidatorIndex, Accuracy>
+	pub struct NposCompactSolution16::<
+		VoterIndex = u32,
+		TargetIndex = u16,
+		Accuracy = sp_runtime::PerU16,
+	>(16)
 );
 
 impl pallet_election_provider_multi_phase::Config for Runtime {
diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
index 8422a31bffb..ed60689c3cf 100644
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ b/polkadot/runtime/polkadot/src/lib.rs
@@ -331,8 +331,11 @@ parameter_types! {
 
 sp_npos_elections::generate_solution_type!(
 	#[compact]
-	pub struct NposCompactSolution16::<u32, u16, sp_runtime::PerU16>(16)
-	// -------------------- ^^ <NominatorIndex, ValidatorIndex, Accuracy>
+	pub struct NposCompactSolution16::<
+		VoterIndex = u32,
+		TargetIndex = u16,
+		Accuracy = sp_runtime::PerU16,
+	>(16)
 );
 
 impl pallet_election_provider_multi_phase::Config for Runtime {
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index 283a1979520..9709366306d 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -313,8 +313,11 @@ parameter_types! {
 
 sp_npos_elections::generate_solution_type!(
 	#[compact]
-	pub struct NposCompactSolution16::<u32, u16, sp_runtime::PerU16>(16)
-	// -------------------- ^^ <NominatorIndex, ValidatorIndex, Accuracy>
+	pub struct NposCompactSolution16::<
+		VoterIndex = u32,
+		TargetIndex = u16,
+		Accuracy = sp_runtime::PerU16,
+	>(16)
 );
 
 impl pallet_election_provider_multi_phase::Config for Runtime {
-- 
GitLab