diff --git a/Cargo.lock b/Cargo.lock
index 062122df085c..e7e0bb98fb2f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1013,9 +1013,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
 [[package]]
 name = "chacha20"
-version = "0.7.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea8756167ea0aca10e066cdbe7813bd71d2f24e69b0bc7b50509590cef2ce0b9"
+checksum = "fee7ad89dc1128635074c268ee661f90c3f7e83d9fd12910608c36b47d6c3412"
 dependencies = [
  "cfg-if 1.0.0",
  "cipher",
@@ -1025,9 +1025,9 @@ dependencies = [
 
 [[package]]
 name = "chacha20poly1305"
-version = "0.8.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "175a11316f33592cf2b71416ee65283730b5b7849813c4891d02a12906ed9acc"
+checksum = "1580317203210c517b6d44794abfbe600698276db18127e37ad3e69bf5e848e5"
 dependencies = [
  "aead",
  "chacha20",
@@ -1920,7 +1920,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1938,7 +1938,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1957,7 +1957,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "Inflector",
  "chrono",
@@ -1983,7 +1983,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1996,7 +1996,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2011,7 +2011,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "14.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -2022,7 +2022,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2048,7 +2048,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "Inflector",
  "frame-support-procedural-tools",
@@ -2060,7 +2060,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.0.0",
@@ -2072,7 +2072,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2082,7 +2082,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-metadata",
  "frame-support",
@@ -2103,7 +2103,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test-pallet"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2113,7 +2113,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support",
  "log",
@@ -2129,7 +2129,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2143,7 +2143,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2152,7 +2152,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support",
  "sp-api",
@@ -4530,7 +4530,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4545,7 +4545,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4559,7 +4559,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4582,7 +4582,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4637,7 +4637,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4715,7 +4715,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4731,7 +4731,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4746,7 +4746,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4769,7 +4769,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4786,7 +4786,7 @@ dependencies = [
 [[package]]
 name = "pallet-gilt"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4800,7 +4800,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4822,7 +4822,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4837,7 +4837,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4856,7 +4856,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4872,7 +4872,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4888,7 +4888,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "ckb-merkle-mountain-range",
  "frame-benchmarking",
@@ -4905,7 +4905,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4921,7 +4921,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -4938,7 +4938,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4952,7 +4952,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4965,7 +4965,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4981,7 +4981,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5003,7 +5003,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5017,7 +5017,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5030,7 +5030,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5045,7 +5045,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5065,7 +5065,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5081,7 +5081,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5094,7 +5094,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5116,7 +5116,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -5127,7 +5127,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -5136,7 +5136,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5149,7 +5149,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5166,7 +5166,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5181,7 +5181,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5197,7 +5197,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -5214,7 +5214,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5225,7 +5225,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5241,7 +5241,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5256,7 +5256,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6640,6 +6640,7 @@ dependencies = [
  "sp-inherents",
  "sp-io",
  "sp-keystore",
+ "sp-npos-elections",
  "sp-runtime",
  "sp-session",
  "sp-staking",
@@ -7646,7 +7647,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "env_logger 0.9.0",
  "jsonrpsee-proc-macros",
@@ -7867,16 +7868,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
 
-[[package]]
-name = "ruzstd"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d425143485a37727c7a46e689bbe3b883a00f42b4a52c4ac0f44855c1009b00"
-dependencies = [
- "byteorder",
- "twox-hash",
-]
-
 [[package]]
 name = "rw-stream-sink"
 version = "0.2.1"
@@ -7915,7 +7906,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "log",
  "sp-core",
@@ -7926,7 +7917,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -7953,7 +7944,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "futures 0.3.17",
  "futures-timer 3.0.2",
@@ -7976,7 +7967,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -7992,7 +7983,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8008,7 +7999,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -8019,7 +8010,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "chrono",
  "fdlimit",
@@ -8057,7 +8048,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "fnv",
  "futures 0.3.17",
@@ -8085,7 +8076,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -8110,7 +8101,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-trait",
  "futures 0.3.17",
@@ -8134,7 +8125,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8177,7 +8168,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "derive_more",
  "futures 0.3.17",
@@ -8201,7 +8192,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -8214,7 +8205,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-manual-seal"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -8248,7 +8239,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-trait",
  "futures 0.3.17",
@@ -8274,7 +8265,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "sc-client-api",
  "sp-authorship",
@@ -8285,7 +8276,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "lazy_static",
  "libsecp256k1 0.6.0",
@@ -8311,9 +8302,10 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "derive_more",
+ "environmental",
  "parity-scale-codec",
  "pwasm-utils",
  "sc-allocator",
@@ -8328,7 +8320,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8344,7 +8336,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -8363,7 +8355,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8400,7 +8392,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "derive_more",
  "finality-grandpa",
@@ -8424,7 +8416,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.17",
@@ -8441,7 +8433,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -8456,7 +8448,7 @@ dependencies = [
 [[package]]
 name = "sc-light"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -8474,7 +8466,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-std",
  "async-trait",
@@ -8525,7 +8517,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "futures 0.3.17",
  "futures-timer 3.0.2",
@@ -8541,7 +8533,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "bytes 1.0.1",
  "fnv",
@@ -8568,7 +8560,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "futures 0.3.17",
  "libp2p",
@@ -8581,7 +8573,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -8590,7 +8582,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "futures 0.3.17",
  "hash-db",
@@ -8621,7 +8613,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "futures 0.3.17",
  "jsonrpc-core",
@@ -8646,7 +8638,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "futures 0.3.17",
  "jsonrpc-core",
@@ -8662,7 +8654,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-trait",
  "directories",
@@ -8726,7 +8718,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8740,7 +8732,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -8762,7 +8754,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "chrono",
  "futures 0.3.17",
@@ -8780,7 +8772,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "ansi_term 0.12.1",
  "atty",
@@ -8809,7 +8801,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -8820,7 +8812,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "futures 0.3.17",
  "intervalier",
@@ -8847,7 +8839,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "derive_more",
  "futures 0.3.17",
@@ -8861,7 +8853,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "futures 0.3.17",
  "futures-timer 3.0.2",
@@ -9292,7 +9284,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "hash-db",
  "log",
@@ -9309,7 +9301,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate 1.0.0",
@@ -9321,7 +9313,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -9333,7 +9325,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -9347,7 +9339,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9359,7 +9351,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -9371,7 +9363,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9383,7 +9375,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "futures 0.3.17",
  "log",
@@ -9401,7 +9393,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-trait",
  "futures 0.3.17",
@@ -9420,7 +9412,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-trait",
  "merlin",
@@ -9442,7 +9434,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "parity-scale-codec",
  "sp-arithmetic",
@@ -9452,7 +9444,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -9464,7 +9456,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -9508,7 +9500,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "kvdb",
  "parking_lot 0.11.1",
@@ -9517,7 +9509,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9527,7 +9519,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -9538,7 +9530,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -9555,7 +9547,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -9569,7 +9561,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "futures 0.3.17",
  "hash-db",
@@ -9594,7 +9586,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -9605,7 +9597,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -9622,29 +9614,29 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
- "ruzstd",
  "zstd",
 ]
 
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "parity-scale-codec",
  "serde",
  "sp-arithmetic",
  "sp-core",
  "sp-npos-elections-solution-type",
+ "sp-runtime",
  "sp-std",
 ]
 
 [[package]]
 name = "sp-npos-elections-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -9655,7 +9647,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -9665,7 +9657,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "backtrace",
 ]
@@ -9673,7 +9665,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -9683,7 +9675,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -9704,7 +9696,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9721,7 +9713,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.0.0",
@@ -9733,7 +9725,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "serde",
  "serde_json",
@@ -9742,7 +9734,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9755,7 +9747,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -9765,7 +9757,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "hash-db",
  "log",
@@ -9788,12 +9780,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 
 [[package]]
 name = "sp-storage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9806,7 +9798,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "log",
  "sp-core",
@@ -9819,7 +9811,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-trait",
  "futures-timer 3.0.2",
@@ -9835,7 +9827,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "erased-serde",
  "log",
@@ -9853,7 +9845,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -9862,7 +9854,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-trait",
  "log",
@@ -9877,7 +9869,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -9891,7 +9883,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9906,7 +9898,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -9917,7 +9909,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9942,6 +9934,7 @@ name = "staking-miner"
 version = "0.9.9"
 dependencies = [
  "env_logger 0.9.0",
+ "frame-election-provider-support",
  "frame-support",
  "frame-system",
  "jsonrpsee-ws-client",
@@ -9962,6 +9955,7 @@ dependencies = [
  "serde_json",
  "sp-core",
  "sp-io",
+ "sp-npos-elections",
  "sp-runtime",
  "sp-version",
  "structopt",
@@ -10111,7 +10105,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "platforms",
 ]
@@ -10119,7 +10113,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.17",
@@ -10141,7 +10135,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-std",
  "derive_more",
@@ -10155,7 +10149,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "async-trait",
  "futures 0.3.17",
@@ -10182,7 +10176,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "futures 0.3.17",
  "substrate-test-utils-derive",
@@ -10192,7 +10186,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "proc-macro-crate 1.0.0",
  "proc-macro2",
@@ -10203,7 +10197,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "ansi_term 0.12.1",
  "build-helper",
@@ -10356,7 +10350,7 @@ dependencies = [
 [[package]]
 name = "test-runner"
 version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "frame-system",
  "futures 0.3.17",
@@ -10763,7 +10757,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#6e15de9703bfe09b85efa33fd6e3a94d2446dd01"
+source = "git+https://github.com/paritytech/substrate?branch=master#f84ac630acccbfadc9f7cd8364fc43e03d743103"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -11692,9 +11686,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.3.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd"
+checksum = "377db0846015f7ae377174787dd452e1c5f5a9050bc6f954911d01f116daa0cd"
 dependencies = [
  "zeroize_derive",
 ]
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index 0cab21759104..9d3cf52efd29 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -22,6 +22,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
 sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-core = { 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-authorship = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -90,6 +91,7 @@ std = [
 	"libsecp256k1/std",
 	"runtime-parachains/std",
 	"xcm/std",
+	"sp-npos-elections/std",
 ]
 runtime-benchmarks = [
 	"libsecp256k1/hmac",
diff --git a/runtime/common/src/elections.rs b/runtime/common/src/elections.rs
index b85d8013f4f4..d42fe0d4dc2a 100644
--- a/runtime/common/src/elections.rs
+++ b/runtime/common/src/elections.rs
@@ -55,3 +55,30 @@ impl pallet_election_provider_multi_phase::BenchmarkingConfig for BenchmarkConfi
 	const MINER_MAXIMUM_VOTERS: u32 = 15_000;
 	const MAXIMUM_TARGETS: u32 = 2000;
 }
+
+/// Maximum number of iterations for balancing that will be executed in the embedded miner of
+/// pallet-election-provider-multi-phase.
+pub const MINER_MAX_ITERATIONS: u32 = 10;
+
+/// A source of random balance for the NPoS Solver, which is meant to be run by the OCW election
+/// miner.
+pub struct OffchainRandomBalancing;
+impl frame_support::pallet_prelude::Get<Option<(usize, sp_npos_elections::ExtendedBalance)>>
+	for OffchainRandomBalancing
+{
+	fn get() -> Option<(usize, sp_npos_elections::ExtendedBalance)> {
+		use sp_runtime::{codec::Decode, traits::TrailingZeroInput};
+		let iters = match MINER_MAX_ITERATIONS {
+			0 => 0,
+			max @ _ => {
+				let seed = sp_io::offchain::random_seed();
+				let random = <u32>::decode(&mut TrailingZeroInput::new(&seed))
+					.expect("input is padded with zeroes; qed") %
+					max.saturating_add(1);
+				random as usize
+			},
+		};
+
+		Some((iters, 0))
+	}
+}
diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
index 23a45a675cd5..e04b6f05038b 100644
--- a/runtime/kusama/src/lib.rs
+++ b/runtime/kusama/src/lib.rs
@@ -356,7 +356,6 @@ parameter_types! {
 	pub SolutionImprovementThreshold: Perbill = Perbill::from_rational(5u32, 10_000);
 
 	// miner configs
-	pub const MinerMaxIterations: u32 = 10;
 	pub OffchainRepeat: BlockNumber = 5;
 }
 
@@ -384,7 +383,6 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type RewardHandler = (); // nothing to do upon rewards
 	type SignedPhase = SignedPhase;
 	type SolutionImprovementThreshold = SolutionImprovementThreshold;
-	type MinerMaxIterations = MinerMaxIterations;
 	type MinerMaxWeight = OffchainSolutionWeightLimit; // For now use the one from staking.
 	type MinerMaxLength = OffchainSolutionLengthLimit;
 	type OffchainRepeat = OffchainRepeat;
@@ -393,6 +391,11 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type Solution = NposCompactSolution24;
 	type OnChainAccuracy = Perbill;
 	type Fallback = Fallback;
+	type Solver = frame_election_provider_support::SequentialPhragmen<
+		AccountId,
+		pallet_election_provider_multi_phase::SolutionAccuracyOf<Runtime>,
+		runtime_common::elections::OffchainRandomBalancing,
+	>;
 	type BenchmarkingConfig = runtime_common::elections::BenchmarkConfig;
 	type ForceOrigin = EnsureOneOf<
 		AccountId,
diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
index 659ab412650d..15f394355b2a 100644
--- a/runtime/polkadot/src/lib.rs
+++ b/runtime/polkadot/src/lib.rs
@@ -362,7 +362,6 @@ parameter_types! {
 	pub SolutionImprovementThreshold: Perbill = Perbill::from_rational(5u32, 10_000);
 
 	// miner configs
-	pub const MinerMaxIterations: u32 = 10;
 	pub OffchainRepeat: BlockNumber = 5;
 }
 
@@ -390,7 +389,6 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type SlashHandler = (); // burn slashes
 	type RewardHandler = (); // nothing to do upon rewards
 	type SolutionImprovementThreshold = SolutionImprovementThreshold;
-	type MinerMaxIterations = MinerMaxIterations;
 	type MinerMaxWeight = OffchainSolutionWeightLimit; // For now use the one from staking.
 	type MinerMaxLength = OffchainSolutionLengthLimit;
 	type OffchainRepeat = OffchainRepeat;
@@ -399,6 +397,11 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type OnChainAccuracy = Perbill;
 	type Solution = NposCompactSolution16;
 	type Fallback = Fallback;
+	type Solver = frame_election_provider_support::SequentialPhragmen<
+		AccountId,
+		pallet_election_provider_multi_phase::SolutionAccuracyOf<Runtime>,
+		runtime_common::elections::OffchainRandomBalancing,
+	>;
 	type BenchmarkingConfig = runtime_common::elections::BenchmarkConfig;
 	type ForceOrigin = EnsureOneOf<
 		AccountId,
diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
index bc494ae9440f..c99c811cb031 100644
--- a/runtime/westend/src/lib.rs
+++ b/runtime/westend/src/lib.rs
@@ -342,7 +342,6 @@ parameter_types! {
 	pub SolutionImprovementThreshold: Perbill = Perbill::from_rational(5u32, 10_000);
 
 	// miner configs
-	pub const MinerMaxIterations: u32 = 10;
 	pub OffchainRepeat: BlockNumber = 5;
 }
 
@@ -370,7 +369,6 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type SlashHandler = (); // burn slashes
 	type RewardHandler = (); // nothing to do upon rewards
 	type SolutionImprovementThreshold = SolutionImprovementThreshold;
-	type MinerMaxIterations = MinerMaxIterations;
 	type MinerMaxWeight = OffchainSolutionWeightLimit; // For now use the one from staking.
 	type MinerMaxLength = OffchainSolutionLengthLimit;
 	type OffchainRepeat = OffchainRepeat;
@@ -379,6 +377,11 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type OnChainAccuracy = Perbill;
 	type Solution = NposCompactSolution16;
 	type Fallback = Fallback;
+	type Solver = frame_election_provider_support::SequentialPhragmen<
+		AccountId,
+		pallet_election_provider_multi_phase::SolutionAccuracyOf<Runtime>,
+		runtime_common::elections::OffchainRandomBalancing,
+	>;
 	type BenchmarkingConfig = runtime_common::elections::BenchmarkConfig;
 	type ForceOrigin = EnsureRoot<AccountId>;
 	type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Runtime>;
diff --git a/utils/staking-miner/Cargo.toml b/utils/staking-miner/Cargo.toml
index 440fc5b890c8..c1eccc1a8093 100644
--- a/utils/staking-miner/Cargo.toml
+++ b/utils/staking-miner/Cargo.toml
@@ -22,11 +22,13 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-version = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/utils/staking-miner/src/dry_run.rs b/utils/staking-miner/src/dry_run.rs
index 236d63ce4cc1..ffebdb3fadf2 100644
--- a/utils/staking-miner/src/dry_run.rs
+++ b/utils/staking-miner/src/dry_run.rs
@@ -23,7 +23,7 @@ use codec::Encode;
 use frame_support::traits::Currency;
 
 /// Forcefully create the snapshot. This can be used to compute the election at anytime.
-fn force_create_snapshot<T: EPM::Config>(ext: &mut Ext) -> Result<(), Error> {
+fn force_create_snapshot<T: EPM::Config>(ext: &mut Ext) -> Result<(), Error<T>> {
 	ext.execute_with(|| {
 		if <EPM::Snapshot<T>>::exists() {
 			log::info!(target: LOG_TARGET, "snapshot already exists.");
@@ -112,7 +112,7 @@ macro_rules! dry_run_cmd_for { ($runtime:ident) => { paste::paste! {
 		shared: SharedConfig,
 		config: DryRunConfig,
 		signer: Signer,
-	) -> Result<(), Error> {
+	) -> Result<(), Error<$crate::[<$runtime _runtime_exports>]::Runtime>> {
 		use $crate::[<$runtime _runtime_exports>]::*;
 		let mut ext = crate::create_election_ext::<Runtime, Block>(
 			shared.uri.clone(),
@@ -121,7 +121,8 @@ macro_rules! dry_run_cmd_for { ($runtime:ident) => { paste::paste! {
 		).await?;
 		force_create_snapshot::<Runtime>(&mut ext)?;
 
-		let (raw_solution, witness) = crate::mine_unchecked::<Runtime>(&mut ext, config.iterations, false)?;
+		let (raw_solution, witness) = crate::mine_with::<Runtime>(&config.solver, &mut ext)?;
+
 		let nonce = crate::get_account_info::<Runtime>(client, &signer.account, config.at)
 			.await?
 			.map(|i| i.nonce)
@@ -148,7 +149,9 @@ macro_rules! dry_run_cmd_for { ($runtime:ident) => { paste::paste! {
 		});
 		log::info!(target: LOG_TARGET, "dispatch result is {:?}", dispatch_result);
 
-		let outcome = rpc_decode::<sp_runtime::ApplyExtrinsicResult>(client, "system_dryRun", params!{ bytes }).await?;
+		let outcome = rpc_decode::<sp_runtime::ApplyExtrinsicResult>(client, "system_dryRun", params!{ bytes })
+			.await
+			.map_err::<Error<Runtime>, _>(Into::into)?;
 		log::info!(target: LOG_TARGET, "dry-run outcome is {:?}", outcome);
 		Ok(())
 	}
diff --git a/utils/staking-miner/src/emergency_solution.rs b/utils/staking-miner/src/emergency_solution.rs
index ff7464c0c042..d27c23e38601 100644
--- a/utils/staking-miner/src/emergency_solution.rs
+++ b/utils/staking-miner/src/emergency_solution.rs
@@ -18,20 +18,22 @@
 
 use crate::{prelude::*, Error, SharedConfig};
 use codec::Encode;
+use frame_election_provider_support::SequentialPhragmen;
 use std::io::Write;
 
 macro_rules! emergency_solution_cmd_for { ($runtime:ident) => { paste::paste! {
 	/// Execute the emergency-solution command.
 	pub(crate) async fn [<emergency_solution_cmd_ $runtime>](
 		shared: SharedConfig,
-	) -> Result<(), Error> {
+	) -> Result<(), Error<$crate::[<$runtime _runtime_exports>]::Runtime>> {
 		use $crate::[<$runtime _runtime_exports>]::*;
 		let mut ext = crate::create_election_ext::<Runtime, Block>(shared.uri.clone(), None, vec![]).await?;
 		ext.execute_with(|| {
 			assert!(EPM::Pallet::<Runtime>::current_phase().is_emergency());
 			// NOTE: this internally calls feasibility_check, but we just re-do it here as an easy way
 			// to get a `ReadySolution`.
-			let (raw_solution, _) = <EPM::Pallet<Runtime>>::mine_solution(50)?;
+			let (raw_solution, _) =
+				<EPM::Pallet<Runtime>>::mine_solution::<SequentialPhragmen<AccountId, sp_runtime::Perbill>>()?;
 			log::info!(target: LOG_TARGET, "mined solution with {:?}", &raw_solution.score);
 			let ready_solution = EPM::Pallet::<Runtime>::feasibility_check(raw_solution, EPM::ElectionCompute::Signed)?;
 			let encoded_ready = ready_solution.encode();
diff --git a/utils/staking-miner/src/main.rs b/utils/staking-miner/src/main.rs
index 1769382e62af..45140323807f 100644
--- a/utils/staking-miner/src/main.rs
+++ b/utils/staking-miner/src/main.rs
@@ -38,9 +38,11 @@ mod signer;
 pub(crate) use prelude::*;
 pub(crate) use signer::get_account_info;
 
+use frame_election_provider_support::NposSolver;
 use frame_support::traits::Get;
 use jsonrpsee_ws_client::{WsClient, WsClientBuilder};
 use remote_externalities::{Builder, Mode, OnlineConfig};
+use sp_npos_elections::ExtendedBalance;
 use sp_runtime::traits::Block as BlockT;
 use structopt::StructOpt;
 
@@ -193,15 +195,43 @@ macro_rules! any_runtime {
 	}
 }
 
-#[derive(Debug, thiserror::Error)]
-enum Error {
+/// Same as [`any_runtime`], but instead of returning a `Result`, this simply returns `()`. Useful
+/// for situations where the result is not useful and un-ergonomic to handle.
+#[macro_export]
+macro_rules! any_runtime_unit {
+	($($code:tt)*) => {
+		unsafe {
+			match $crate::RUNTIME {
+				$crate::AnyRuntime::Polkadot => {
+					#[allow(unused)]
+					use $crate::polkadot_runtime_exports::*;
+					let _ = $($code)*;
+				},
+				$crate::AnyRuntime::Kusama => {
+					#[allow(unused)]
+					use $crate::kusama_runtime_exports::*;
+					let _ = $($code)*;
+				},
+				$crate::AnyRuntime::Westend => {
+					#[allow(unused)]
+					use $crate::westend_runtime_exports::*;
+					let _ = $($code)*;
+				}
+			}
+		}
+	}
+}
+
+#[derive(frame_support::DebugNoBound, thiserror::Error)]
+enum Error<T: EPM::Config> {
 	Io(#[from] std::io::Error),
-	Jsonrpsee(#[from] jsonrpsee_ws_client::types::Error),
+	JsonRpsee(#[from] jsonrpsee_ws_client::types::Error),
+	RpcHelperError(#[from] rpc_helpers::RpcHelperError),
 	Codec(#[from] codec::Error),
 	Crypto(sp_core::crypto::SecretStringError),
 	RemoteExternalities(&'static str),
-	PalletMiner(EPM::unsigned::MinerError),
-	PalletElection(EPM::ElectionError),
+	PalletMiner(EPM::unsigned::MinerError<T>),
+	PalletElection(EPM::ElectionError<T>),
 	PalletFeasibility(EPM::FeasibilityError),
 	AccountDoesNotExists,
 	IncorrectPhase,
@@ -209,33 +239,33 @@ enum Error {
 	VersionMismatch,
 }
 
-impl From<sp_core::crypto::SecretStringError> for Error {
-	fn from(e: sp_core::crypto::SecretStringError) -> Error {
+impl<T: EPM::Config> From<sp_core::crypto::SecretStringError> for Error<T> {
+	fn from(e: sp_core::crypto::SecretStringError) -> Error<T> {
 		Error::Crypto(e)
 	}
 }
 
-impl From<EPM::unsigned::MinerError> for Error {
-	fn from(e: EPM::unsigned::MinerError) -> Error {
+impl<T: EPM::Config> From<EPM::unsigned::MinerError<T>> for Error<T> {
+	fn from(e: EPM::unsigned::MinerError<T>) -> Error<T> {
 		Error::PalletMiner(e)
 	}
 }
 
-impl From<EPM::ElectionError> for Error {
-	fn from(e: EPM::ElectionError) -> Error {
+impl<T: EPM::Config> From<EPM::ElectionError<T>> for Error<T> {
+	fn from(e: EPM::ElectionError<T>) -> Error<T> {
 		Error::PalletElection(e)
 	}
 }
 
-impl From<EPM::FeasibilityError> for Error {
-	fn from(e: EPM::FeasibilityError) -> Error {
+impl<T: EPM::Config> From<EPM::FeasibilityError> for Error<T> {
+	fn from(e: EPM::FeasibilityError) -> Error<T> {
 		Error::PalletFeasibility(e)
 	}
 }
 
-impl std::fmt::Display for Error {
+impl<T: EPM::Config> std::fmt::Display for Error<T> {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-		<Error as std::fmt::Debug>::fmt(self, f)
+		<Error<T> as std::fmt::Debug>::fmt(self, f)
 	}
 }
 
@@ -249,6 +279,58 @@ enum Command {
 	EmergencySolution,
 }
 
+#[derive(Debug, Clone, StructOpt)]
+enum Solvers {
+	SeqPhragmen {
+		#[structopt(long, default_value = "10")]
+		iterations: usize,
+	},
+	PhragMMS {
+		#[structopt(long, default_value = "10")]
+		iterations: usize,
+	},
+}
+
+/// Mine a solution with the given `solver`.
+fn mine_with<T>(
+	solver: &Solvers,
+	ext: &mut Ext,
+) -> Result<(EPM::RawSolution<EPM::SolutionOf<T>>, u32), Error<T>>
+where
+	T: EPM::Config,
+	T::Solver: NposSolver<Error = sp_npos_elections::Error>,
+{
+	use frame_election_provider_support::{PhragMMS, SequentialPhragmen};
+
+	match solver {
+		Solvers::SeqPhragmen { iterations } => {
+			BalanceIterations::set(*iterations);
+			mine_unchecked::<
+				T,
+				SequentialPhragmen<
+					<T as frame_system::Config>::AccountId,
+					sp_runtime::Perbill,
+					Balancing,
+				>,
+			>(ext, false)
+		},
+		Solvers::PhragMMS { iterations } => {
+			BalanceIterations::set(*iterations);
+			mine_unchecked::<
+				T,
+				PhragMMS<<T as frame_system::Config>::AccountId, sp_runtime::Perbill, Balancing>,
+			>(ext, false)
+		},
+	}
+}
+
+frame_support::parameter_types! {
+	/// Number of balancing iterations for a solution algorithm. Set based on the [`Solvers`] CLI
+	/// config.
+	pub static BalanceIterations: usize = 10;
+	pub static Balancing: Option<(usize, ExtendedBalance)> = Some((BalanceIterations::get(), 0));
+}
+
 #[derive(Debug, Clone, StructOpt)]
 struct MonitorConfig {
 	/// They type of event to listen to.
@@ -259,8 +341,8 @@ struct MonitorConfig {
 	#[structopt(long, default_value = "head", possible_values = &["head", "finalized"])]
 	listen: String,
 
-	#[structopt(long, short, default_value = "10")]
-	iterations: usize,
+	#[structopt(subcommand)]
+	solver: Solvers,
 }
 
 #[derive(Debug, Clone, StructOpt)]
@@ -269,8 +351,8 @@ struct DryRunConfig {
 	#[structopt(long)]
 	at: Option<Hash>,
 
-	#[structopt(long, short, default_value = "10")]
-	iterations: usize,
+	#[structopt(subcommand)]
+	solver: Solvers,
 }
 
 #[derive(Debug, Clone, StructOpt)]
@@ -303,7 +385,7 @@ async fn create_election_ext<T: EPM::Config, B: BlockT>(
 	uri: String,
 	at: Option<B::Hash>,
 	additional: Vec<String>,
-) -> Result<Ext, Error> {
+) -> Result<Ext, Error<T>> {
 	use frame_support::{storage::generator::StorageMap, traits::PalletInfo};
 	use sp_core::hashing::twox_128;
 
@@ -327,13 +409,20 @@ async fn create_election_ext<T: EPM::Config, B: BlockT>(
 
 /// Compute the election at the given block number. It expects to NOT be `Phase::Off`. In other
 /// words, the snapshot must exists on the given externalities.
-fn mine_unchecked<T: EPM::Config>(
+fn mine_unchecked<T, S>(
 	ext: &mut Ext,
-	iterations: usize,
 	do_feasibility: bool,
-) -> Result<(EPM::RawSolution<EPM::SolutionOf<T>>, u32), Error> {
+) -> Result<(EPM::RawSolution<EPM::SolutionOf<T>>, u32), Error<T>>
+where
+	T: EPM::Config,
+	S: NposSolver<
+		Error = <<T as EPM::Config>::Solver as NposSolver>::Error,
+		AccountId = <<T as EPM::Config>::Solver as NposSolver>::AccountId,
+	>,
+{
 	ext.execute_with(|| {
-		let (solution, _) = <EPM::Pallet<T>>::mine_solution(iterations)?;
+		let (solution, _) =
+			<EPM::Pallet<T>>::mine_solution::<S>().map_err::<Error<T>, _>(Into::into)?;
 		if do_feasibility {
 			let _ = <EPM::Pallet<T>>::feasibility_check(
 				solution.clone(),
@@ -346,7 +435,7 @@ fn mine_unchecked<T: EPM::Config>(
 }
 
 #[allow(unused)]
-fn mine_dpos<T: EPM::Config>(ext: &mut Ext) -> Result<(), Error> {
+fn mine_dpos<T: EPM::Config>(ext: &mut Ext) -> Result<(), Error<T>> {
 	ext.execute_with(|| {
 		use std::collections::BTreeMap;
 		use EPM::RoundSnapshot;
@@ -383,10 +472,10 @@ fn mine_dpos<T: EPM::Config>(ext: &mut Ext) -> Result<(), Error> {
 	})
 }
 
-pub(crate) async fn check_versions<T: frame_system::Config>(
+pub(crate) async fn check_versions<T: frame_system::Config + EPM::Config>(
 	client: &WsClient,
 	print: bool,
-) -> Result<(), Error> {
+) -> Result<(), Error<T>> {
 	let linked_version = T::Version::get();
 	let on_chain_version = rpc_helpers::rpc::<sp_version::RuntimeVersion>(
 		client,
@@ -486,7 +575,7 @@ async fn main() {
 	}
 	log::info!(target: LOG_TARGET, "connected to chain {:?}", chain);
 
-	let _ = any_runtime! {
+	any_runtime_unit! {
 		check_versions::<Runtime>(&client, true).await
 	};
 
@@ -498,9 +587,18 @@ async fn main() {
 
 	let outcome = any_runtime! {
 		match command.clone() {
-			Command::Monitor(c) => monitor_cmd(&client, shared, c, signer_account).await,
-			Command::DryRun(c) => dry_run_cmd(&client, shared, c, signer_account).await,
-			Command::EmergencySolution => emergency_solution_cmd(shared.clone()).await,
+			Command::Monitor(c) => monitor_cmd(&client, shared, c, signer_account).await
+				.map_err(|e| {
+					log::error!(target: LOG_TARGET, "Monitor error: {:?}", e);
+				}),
+			Command::DryRun(c) => dry_run_cmd(&client, shared, c, signer_account).await
+				.map_err(|e| {
+					log::error!(target: LOG_TARGET, "DryRun error: {:?}", e);
+				}),
+			Command::EmergencySolution => emergency_solution_cmd(shared.clone()).await
+				.map_err(|e| {
+					log::error!(target: LOG_TARGET, "EmergencySolution error: {:?}", e);
+				}),
 		}
 	};
 	log::info!(target: LOG_TARGET, "round of execution finished. outcome = {:?}", outcome);
diff --git a/utils/staking-miner/src/monitor.rs b/utils/staking-miner/src/monitor.rs
index d6ea12401d82..396700335dd7 100644
--- a/utils/staking-miner/src/monitor.rs
+++ b/utils/staking-miner/src/monitor.rs
@@ -30,10 +30,11 @@ use sc_transaction_pool_api::TransactionStatus;
 async fn ensure_signed_phase<T: EPM::Config, B: BlockT>(
 	client: &WsClient,
 	at: B::Hash,
-) -> Result<(), Error> {
+) -> Result<(), Error<T>> {
 	let key = sp_core::storage::StorageKey(EPM::CurrentPhase::<T>::hashed_key().to_vec());
 	let phase = get_storage::<EPM::Phase<BlockNumber>>(client, params! {key, at})
-		.await?
+		.await
+		.map_err::<Error<T>, _>(Into::into)?
 		.unwrap_or_default();
 
 	if phase.is_signed() {
@@ -50,7 +51,7 @@ async fn ensure_no_previous_solution<
 >(
 	ext: &mut Ext,
 	us: &AccountId,
-) -> Result<(), Error> {
+) -> Result<(), Error<T>> {
 	use EPM::signed::SignedSubmissions;
 	ext.execute_with(|| {
 		if <SignedSubmissions<T>>::get().iter().any(|ss| &ss.who == us) {
@@ -68,7 +69,7 @@ macro_rules! monitor_cmd_for { ($runtime:tt) => { paste::paste! {
 		shared: SharedConfig,
 		config: MonitorConfig,
 		signer: Signer,
-	) -> Result<(), Error> {
+	) -> Result<(), Error<$crate::[<$runtime _runtime_exports>]::Runtime>> {
 		use $crate::[<$runtime _runtime_exports>]::*;
 		let (sub, unsub) = if config.listen == "head" {
 			("chain_subscribeNewHeads", "chain_unsubscribeNewHeads")
@@ -109,7 +110,8 @@ macro_rules! monitor_cmd_for { ($runtime:tt) => { paste::paste! {
 				continue;
 			}
 
-			let (raw_solution, witness) = crate::mine_unchecked::<Runtime>(&mut ext, config.iterations, true)?;
+			let (raw_solution, witness) = crate::mine_with::<Runtime>(&config.solver, &mut ext)?;
+
 			log::info!(target: LOG_TARGET, "mined solution with {:?}", &raw_solution.score);
 
 			let nonce = crate::get_account_info::<Runtime>(client, &signer.account, Some(hash))
@@ -149,8 +151,7 @@ macro_rules! monitor_cmd_for { ($runtime:tt) => { paste::paste! {
 					TransactionStatus::InBlock(hash) => {
 						log::info!(target: LOG_TARGET, "included at {:?}", hash);
 						let key = frame_support::storage::storage_prefix(b"System", b"Events");
-						let events =get_storage::<
-							Vec<frame_system::EventRecord<Event, <Block as BlockT>::Hash>>
+						let events = get_storage::<Vec<frame_system::EventRecord<Event, <Block as BlockT>::Hash>>,
 						>(client, params!{ key, hash }).await?.unwrap_or_default();
 						log::info!(target: LOG_TARGET, "events at inclusion {:?}", events);
 					}
diff --git a/utils/staking-miner/src/rpc_helpers.rs b/utils/staking-miner/src/rpc_helpers.rs
index cc086b1235b1..8cb7330bf0de 100644
--- a/utils/staking-miner/src/rpc_helpers.rs
+++ b/utils/staking-miner/src/rpc_helpers.rs
@@ -20,6 +20,18 @@ use super::*;
 use jsonrpsee_ws_client::types::traits::Client;
 pub(crate) use jsonrpsee_ws_client::types::v2::params::JsonRpcParams;
 
+#[derive(frame_support::DebugNoBound, thiserror::Error)]
+pub(crate) enum RpcHelperError {
+	JsonRpsee(#[from] jsonrpsee_ws_client::types::Error),
+	Codec(#[from] codec::Error),
+}
+
+impl std::fmt::Display for RpcHelperError {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		<RpcHelperError as std::fmt::Debug>::fmt(self, f)
+	}
+}
+
 #[macro_export]
 macro_rules! params {
 	($($param:expr),*) => {
@@ -41,8 +53,11 @@ pub(crate) async fn rpc<'a, Ret: serde::de::DeserializeOwned>(
 	client: &WsClient,
 	method: &'a str,
 	params: JsonRpcParams<'a>,
-) -> Result<Ret, Error> {
-	client.request::<Ret>(method, params).await.map_err(Into::into)
+) -> Result<Ret, RpcHelperError> {
+	client
+		.request::<Ret>(method, params)
+		.await
+		.map_err::<RpcHelperError, _>(Into::into)
 }
 
 /// Make the rpc request, decode the outcome into `Dec`. Don't use for storage, it will fail for
@@ -51,57 +66,26 @@ pub(crate) async fn rpc_decode<'a, Dec: codec::Decode>(
 	client: &WsClient,
 	method: &'a str,
 	params: JsonRpcParams<'a>,
-) -> Result<Dec, Error> {
-	let bytes = rpc::<sp_core::Bytes>(client, method, params).await?;
-	<Dec as codec::Decode>::decode(&mut &*bytes.0).map_err(Into::into)
+) -> Result<Dec, RpcHelperError> {
+	let bytes = rpc::<sp_core::Bytes>(client, method, params)
+		.await
+		.map_err::<RpcHelperError, _>(Into::into)?;
+	<Dec as codec::Decode>::decode(&mut &*bytes.0).map_err::<RpcHelperError, _>(Into::into)
 }
 
 /// Get the storage item.
 pub(crate) async fn get_storage<'a, T: codec::Decode>(
 	client: &WsClient,
 	params: JsonRpcParams<'a>,
-) -> Result<Option<T>, Error> {
-	let maybe_bytes = rpc::<Option<sp_core::Bytes>>(client, "state_getStorage", params).await?;
+) -> Result<Option<T>, RpcHelperError> {
+	let maybe_bytes = rpc::<Option<sp_core::Bytes>>(client, "state_getStorage", params)
+		.await
+		.map_err::<RpcHelperError, _>(Into::into)?;
 	if let Some(bytes) = maybe_bytes {
-		let decoded = <T as codec::Decode>::decode(&mut &*bytes.0)?;
+		let decoded = <T as codec::Decode>::decode(&mut &*bytes.0)
+			.map_err::<RpcHelperError, _>(Into::into)?;
 		Ok(Some(decoded))
 	} else {
 		Ok(None)
 	}
 }
-
-use codec::{EncodeLike, FullCodec};
-use frame_support::storage::{StorageMap, StorageValue};
-#[allow(unused)]
-pub(crate) async fn get_storage_value_frame_v2<'a, V: StorageValue<T>, T: FullCodec, Hash>(
-	client: &WsClient,
-	maybe_at: Option<Hash>,
-) -> Result<Option<V::Query>, Error>
-where
-	V::Query: codec::Decode,
-	Hash: serde::Serialize,
-{
-	let key = <V as StorageValue<T>>::hashed_key();
-	get_storage::<V::Query>(client, params! { key, maybe_at }).await
-}
-
-#[allow(unused)]
-pub(crate) async fn get_storage_map_frame_v2<
-	'a,
-	Hash,
-	KeyArg: EncodeLike<K>,
-	K: FullCodec,
-	T: FullCodec,
-	M: StorageMap<K, T>,
->(
-	client: &WsClient,
-	key: KeyArg,
-	maybe_at: Option<Hash>,
-) -> Result<Option<M::Query>, Error>
-where
-	M::Query: codec::Decode,
-	Hash: serde::Serialize,
-{
-	let key = <M as StorageMap<K, T>>::hashed_key_for(key);
-	get_storage::<M::Query>(client, params! { key, maybe_at }).await
-}
diff --git a/utils/staking-miner/src/signer.rs b/utils/staking-miner/src/signer.rs
index 8dd2696b3309..bc996ef351de 100644
--- a/utils/staking-miner/src/signer.rs
+++ b/utils/staking-miner/src/signer.rs
@@ -34,11 +34,11 @@ pub(crate) struct Signer {
 	pub(crate) pair: Pair,
 }
 
-pub(crate) async fn get_account_info<T: frame_system::Config>(
+pub(crate) async fn get_account_info<T: frame_system::Config + EPM::Config>(
 	client: &WsClient,
 	who: &T::AccountId,
 	maybe_at: Option<T::Hash>,
-) -> Result<Option<frame_system::AccountInfo<Index, T::AccountData>>, Error> {
+) -> Result<Option<frame_system::AccountInfo<Index, T::AccountData>>, Error<T>> {
 	rpc_helpers::get_storage::<frame_system::AccountInfo<Index, T::AccountData>>(
 		client,
 		crate::params! {
@@ -47,26 +47,27 @@ pub(crate) async fn get_account_info<T: frame_system::Config>(
 		},
 	)
 	.await
+	.map_err(Into::into)
 }
 
 /// Read the signer account's URI
 pub(crate) async fn signer_uri_from_string<
 	T: frame_system::Config<
-		AccountId = AccountId,
-		Index = Index,
-		AccountData = pallet_balances::AccountData<Balance>,
-	>,
+			AccountId = AccountId,
+			Index = Index,
+			AccountData = pallet_balances::AccountData<Balance>,
+		> + EPM::Config,
 >(
 	seed: &str,
 	client: &WsClient,
-) -> Result<Signer, Error> {
+) -> Result<Signer, Error<T>> {
 	let seed = seed.trim();
 
 	let pair = Pair::from_string(seed, None)?;
 	let account = T::AccountId::from(pair.public());
 	let _info = get_account_info::<T>(client, &account, None)
 		.await?
-		.ok_or(Error::AccountDoesNotExists)?;
+		.ok_or(Error::<T>::AccountDoesNotExists)?;
 	log::info!(
 		target: LOG_TARGET,
 		"loaded account {:?}, free: {:?}, info: {:?}",