diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index f343b2ac8a..49903eaad0 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -1684,7 +1684,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1702,7 +1702,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "3.1.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1721,7 +1721,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1744,7 +1744,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1757,7 +1757,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1773,7 +1773,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1784,7 +1784,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -1810,7 +1810,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -1822,7 +1822,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.0.0",
@@ -1834,7 +1834,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1844,7 +1844,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-metadata",
  "frame-support",
@@ -1865,7 +1865,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1882,7 +1882,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -1896,7 +1896,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -1905,7 +1905,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3072,6 +3072,7 @@ dependencies = [
  "sp-inherents",
  "sp-io",
  "sp-keyring",
+ "sp-npos-elections",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
@@ -4294,7 +4295,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
 [[package]]
 name = "pallet-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4310,7 +4311,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4325,7 +4326,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4349,7 +4350,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4364,7 +4365,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4379,7 +4380,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4396,7 +4397,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4411,7 +4412,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4432,7 +4433,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4448,7 +4449,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4470,7 +4471,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4486,7 +4487,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4506,7 +4507,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4523,7 +4524,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4537,7 +4538,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4553,7 +4554,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4567,7 +4568,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4583,7 +4584,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4605,7 +4606,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4621,7 +4622,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4634,7 +4635,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -4649,7 +4650,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4665,7 +4666,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4685,7 +4686,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4701,7 +4702,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4715,7 +4716,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4730,7 +4731,6 @@ dependencies = [
  "serde",
  "sp-application-crypto",
  "sp-io",
- "sp-npos-elections",
  "sp-runtime",
  "sp-staking",
  "sp-std",
@@ -4740,7 +4740,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -4751,7 +4751,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4765,7 +4765,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4784,7 +4784,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4799,7 +4799,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4815,7 +4815,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4832,7 +4832,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -4843,7 +4843,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4859,7 +4859,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4875,7 +4875,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -6078,6 +6078,7 @@ dependencies = [
  "sp-inherents",
  "sp-io",
  "sp-keyring",
+ "sp-npos-elections",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
@@ -7049,7 +7050,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "env_logger 0.8.2",
  "hex-literal",
@@ -7316,7 +7317,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7344,7 +7345,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
@@ -7367,7 +7368,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -7383,7 +7384,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7404,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -7415,7 +7416,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -7453,7 +7454,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "derive_more",
  "fnv",
@@ -7487,7 +7488,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -7517,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "sc-client-api",
  "sp-blockchain",
@@ -7528,7 +7529,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "derive_more",
  "fork-tree",
@@ -7574,7 +7575,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
@@ -7598,7 +7599,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -7611,7 +7612,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
@@ -7638,7 +7639,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "log",
  "sc-client-api",
@@ -7652,7 +7653,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "derive_more",
  "lazy_static",
@@ -7681,7 +7682,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "derive_more",
  "parity-scale-codec",
@@ -7697,7 +7698,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7712,7 +7713,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7730,7 +7731,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "derive_more",
  "dyn-clone",
@@ -7769,7 +7770,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -7793,7 +7794,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-warp-sync"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
@@ -7814,7 +7815,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.13",
@@ -7832,7 +7833,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7852,7 +7853,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "hash-db",
  "lazy_static",
@@ -7871,7 +7872,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "async-std",
  "async-trait",
@@ -7924,7 +7925,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
@@ -7941,7 +7942,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "bytes 0.5.6",
  "fnv",
@@ -7969,7 +7970,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "futures 0.3.13",
  "libp2p",
@@ -7982,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7991,7 +7992,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "futures 0.3.13",
  "hash-db",
@@ -8025,7 +8026,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
@@ -8049,7 +8050,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "futures 0.1.29",
  "jsonrpc-core",
@@ -8067,7 +8068,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "directories",
  "exit-future",
@@ -8130,7 +8131,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8145,7 +8146,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -8165,7 +8166,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "chrono",
  "futures 0.3.13",
@@ -8185,7 +8186,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -8212,7 +8213,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -8223,7 +8224,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
@@ -8245,7 +8246,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "futures 0.3.13",
  "futures-diagnose",
@@ -8661,7 +8662,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "log",
  "sp-core",
@@ -8673,7 +8674,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "hash-db",
  "log",
@@ -8690,7 +8691,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate 1.0.0",
@@ -8702,7 +8703,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -8714,7 +8715,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -8727,7 +8728,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8739,7 +8740,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -8750,7 +8751,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8762,7 +8763,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "futures 0.3.13",
  "log",
@@ -8780,7 +8781,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "serde",
  "serde_json",
@@ -8789,7 +8790,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "futures 0.3.13",
  "futures-timer 3.0.2",
@@ -8815,7 +8816,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "merlin",
  "parity-scale-codec",
@@ -8836,7 +8837,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -8846,7 +8847,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -8858,7 +8859,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -8902,7 +8903,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -8911,7 +8912,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8921,7 +8922,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8932,7 +8933,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8949,7 +8950,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.11.1",
@@ -8961,7 +8962,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "futures 0.3.13",
  "hash-db",
@@ -8985,7 +8986,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -8996,7 +8997,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -9013,7 +9014,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -9026,7 +9027,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections-compact"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -9037,7 +9038,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -9047,7 +9048,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "backtrace",
 ]
@@ -9055,7 +9056,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "serde",
  "sp-core",
@@ -9064,7 +9065,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -9085,7 +9086,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9102,7 +9103,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.0.0",
@@ -9114,7 +9115,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "serde",
  "serde_json",
@@ -9123,7 +9124,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9136,7 +9137,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -9146,7 +9147,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "hash-db",
  "log",
@@ -9168,12 +9169,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 
 [[package]]
 name = "sp-storage"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9186,7 +9187,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "log",
  "sp-core",
@@ -9199,7 +9200,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9212,7 +9213,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9225,7 +9226,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "derive_more",
  "futures 0.3.13",
@@ -9241,7 +9242,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -9255,7 +9256,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "futures 0.3.13",
  "futures-core",
@@ -9267,7 +9268,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9279,7 +9280,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9436,7 +9437,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "chrono",
  "console_error_panic_hook",
@@ -9462,7 +9463,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "platforms",
 ]
@@ -9470,7 +9471,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.13",
@@ -9493,7 +9494,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "async-std",
  "derive_more",
@@ -9507,7 +9508,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "futures 0.1.29",
  "futures 0.3.13",
@@ -9535,7 +9536,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "futures 0.3.13",
  "substrate-test-utils-derive",
@@ -9545,7 +9546,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "quote",
@@ -10286,7 +10287,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 [[package]]
 name = "try-runtime-cli"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate#67695c8a2be3d6686331a18f09a43a8c24af4253"
+source = "git+https://github.com/paritytech/substrate#2f69b2d417cbee2c343e0bb6af20fc89e4dea213"
 dependencies = [
  "frame-try-runtime",
  "log",
@@ -10996,6 +10997,7 @@ dependencies = [
  "sp-inherents",
  "sp-io",
  "sp-keyring",
+ "sp-npos-elections",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
diff --git a/polkadot/runtime/kusama/Cargo.toml b/polkadot/runtime/kusama/Cargo.toml
index 5c2fec3e69..f431861b2b 100644
--- a/polkadot/runtime/kusama/Cargo.toml
+++ b/polkadot/runtime/kusama/Cargo.toml
@@ -29,6 +29,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", branch = "master
 sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 
 pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -152,6 +153,7 @@ std = [
 	"sp-session/std",
 	"runtime-common/std",
 	"frame-try-runtime/std",
+	"sp-npos-elections/std",
 ]
 runtime-benchmarks = [
 	"runtime-common/runtime-benchmarks",
diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
index 31d95785b5..70a82c0077 100644
--- a/polkadot/runtime/kusama/src/lib.rs
+++ b/polkadot/runtime/kusama/src/lib.rs
@@ -319,6 +319,12 @@ parameter_types! {
 	pub const MinerMaxIterations: u32 = 10;
 }
 
+sp_npos_elections::generate_solution_type!(
+	#[compact]
+	pub struct NposCompactSolution16::<u32, u16, sp_runtime::PerU16>(16)
+	// -------------------- ^^ <NominatorIndex, ValidatorIndex, Accuracy>
+);
+
 impl pallet_election_provider_multi_phase::Config for Runtime {
 	type Event = Event;
 	type Currency = Balances;
@@ -330,7 +336,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type MinerTxPriority = NposSolutionPriority;
 	type DataProvider = Staking;
 	type OnChainAccuracy = Perbill;
-	type CompactSolution = pallet_staking::CompactAssignments;
+	type CompactSolution = NposCompactSolution16;
 	type Fallback = Fallback;
 	type BenchmarkingConfig = ();
 	type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Runtime>;
@@ -370,6 +376,7 @@ type SlashCancelOrigin = EnsureOneOf<
 >;
 
 impl pallet_staking::Config for Runtime {
+	const MAX_NOMINATIONS: u32 = <NposCompactSolution16 as sp_npos_elections::CompactSolution>::LIMIT as u32;
 	type Currency = Balances;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = CurrencyToVote;
diff --git a/polkadot/runtime/polkadot/Cargo.toml b/polkadot/runtime/polkadot/Cargo.toml
index 1dc4c5f615..2369e6fb0f 100644
--- a/polkadot/runtime/polkadot/Cargo.toml
+++ b/polkadot/runtime/polkadot/Cargo.toml
@@ -17,9 +17,11 @@ smallvec = "1.6.1"
 
 authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -27,8 +29,7 @@ sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 
 pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -148,6 +149,7 @@ std = [
 	"sp-session/std",
 	"runtime-common/std",
 	"frame-try-runtime/std",
+	"sp-npos-elections/std",
 ]
 runtime-benchmarks = [
 	"runtime-common/runtime-benchmarks",
diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs
index d8ee259cac..8422a31bff 100644
--- a/polkadot/runtime/polkadot/src/lib.rs
+++ b/polkadot/runtime/polkadot/src/lib.rs
@@ -329,6 +329,12 @@ parameter_types! {
 	pub const MinerMaxIterations: u32 = 10;
 }
 
+sp_npos_elections::generate_solution_type!(
+	#[compact]
+	pub struct NposCompactSolution16::<u32, u16, sp_runtime::PerU16>(16)
+	// -------------------- ^^ <NominatorIndex, ValidatorIndex, Accuracy>
+);
+
 impl pallet_election_provider_multi_phase::Config for Runtime {
 	type Event = Event;
 	type Currency = Balances;
@@ -340,7 +346,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type MinerTxPriority = NposSolutionPriority;
 	type DataProvider = Staking;
 	type OnChainAccuracy = Perbill;
-	type CompactSolution = pallet_staking::CompactAssignments;
+	type CompactSolution = NposCompactSolution16;
 	type Fallback = Fallback;
 	type BenchmarkingConfig = ();
 	type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Runtime>;
@@ -379,6 +385,7 @@ type SlashCancelOrigin = EnsureOneOf<
 >;
 
 impl pallet_staking::Config for Runtime {
+	const MAX_NOMINATIONS: u32 = <NposCompactSolution16 as sp_npos_elections::CompactSolution>::LIMIT as u32;
 	type Currency = Balances;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = CurrencyToVote;
diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs
index 67b6416b3d..f8a229d03f 100644
--- a/polkadot/runtime/test-runtime/src/lib.rs
+++ b/polkadot/runtime/test-runtime/src/lib.rs
@@ -315,6 +315,7 @@ impl frame_election_provider_support::onchain::Config for Runtime {
 }
 
 impl pallet_staking::Config for Runtime {
+	const MAX_NOMINATIONS: u32 = 16;
 	type Currency = Balances;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = frame_support::traits::U128CurrencyToVote;
diff --git a/polkadot/runtime/westend/Cargo.toml b/polkadot/runtime/westend/Cargo.toml
index 183c5453a1..607fd77dcf 100644
--- a/polkadot/runtime/westend/Cargo.toml
+++ b/polkadot/runtime/westend/Cargo.toml
@@ -29,6 +29,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", branch = "master
 sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 
 pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -152,6 +153,7 @@ std = [
 	"sp-session/std",
 	"runtime-common/std",
 	"frame-try-runtime/std",
+	"sp-npos-elections/std",
 ]
 runtime-benchmarks = [
 	"runtime-common/runtime-benchmarks",
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index 21f2d4e1dd..283a197952 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -311,6 +311,12 @@ parameter_types! {
 	pub const MinerMaxIterations: u32 = 10;
 }
 
+sp_npos_elections::generate_solution_type!(
+	#[compact]
+	pub struct NposCompactSolution16::<u32, u16, sp_runtime::PerU16>(16)
+	// -------------------- ^^ <NominatorIndex, ValidatorIndex, Accuracy>
+);
+
 impl pallet_election_provider_multi_phase::Config for Runtime {
 	type Event = Event;
 	type Currency = Balances;
@@ -322,7 +328,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type MinerTxPriority = NposSolutionPriority;
 	type DataProvider = Staking;
 	type OnChainAccuracy = Perbill;
-	type CompactSolution = pallet_staking::CompactAssignments;
+	type CompactSolution = NposCompactSolution16;
 	type Fallback = Fallback;
 	type BenchmarkingConfig = ();
 	type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Runtime>;
@@ -351,6 +357,7 @@ parameter_types! {
 }
 
 impl pallet_staking::Config for Runtime {
+	const MAX_NOMINATIONS: u32 = <NposCompactSolution16 as sp_npos_elections::CompactSolution>::LIMIT as u32;
 	type Currency = Balances;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = CurrencyToVote;