diff --git a/Cargo.lock b/Cargo.lock
index 3ed3f384f417..b8df8a174f9c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -455,7 +455,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -489,7 +489,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "beefy-gadget",
  "futures",
@@ -508,7 +508,7 @@ dependencies = [
 [[package]]
 name = "binary-merkle-tree"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "hash-db",
  "log",
@@ -2310,7 +2310,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2333,7 +2333,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -2358,7 +2358,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "Inflector",
  "array-bytes",
@@ -2405,7 +2405,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -2416,7 +2416,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -2433,7 +2433,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2462,7 +2462,7 @@ dependencies = [
 [[package]]
 name = "frame-remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "futures",
  "log",
@@ -2478,7 +2478,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2510,7 +2510,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -2525,7 +2525,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -2537,7 +2537,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2547,7 +2547,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2571,7 +2571,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test-pallet"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2582,7 +2582,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-support",
  "log",
@@ -2600,7 +2600,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2615,7 +2615,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2624,7 +2624,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -2795,7 +2795,7 @@ dependencies = [
 [[package]]
 name = "generate-bags"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "chrono",
  "frame-election-provider-support",
@@ -4562,7 +4562,7 @@ dependencies = [
 [[package]]
 name = "mmr-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "futures",
  "log",
@@ -4581,7 +4581,7 @@ dependencies = [
 [[package]]
 name = "mmr-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "anyhow",
  "jsonrpsee",
@@ -5143,7 +5143,7 @@ dependencies = [
 [[package]]
 name = "pallet-assets"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5158,7 +5158,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5174,7 +5174,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5188,7 +5188,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5212,7 +5212,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5232,7 +5232,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list-remote-tests"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-election-provider-support",
  "frame-remote-externalities",
@@ -5251,7 +5251,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5266,7 +5266,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5285,7 +5285,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "array-bytes",
  "binary-merkle-tree",
@@ -5309,7 +5309,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5327,7 +5327,7 @@ dependencies = [
 [[package]]
 name = "pallet-child-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5346,7 +5346,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5363,7 +5363,7 @@ dependencies = [
 [[package]]
 name = "pallet-conviction-voting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -5380,7 +5380,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5398,7 +5398,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5421,7 +5421,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5434,7 +5434,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5452,7 +5452,7 @@ dependencies = [
 [[package]]
 name = "pallet-fast-unstake"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5470,7 +5470,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5481,8 +5481,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-application-crypto",
+ "sp-consensus-grandpa",
  "sp-core",
- "sp-finality-grandpa",
  "sp-io",
  "sp-runtime",
  "sp-session",
@@ -5493,7 +5493,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5509,7 +5509,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5529,7 +5529,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5546,7 +5546,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5563,7 +5563,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5580,7 +5580,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5596,7 +5596,7 @@ dependencies = [
 [[package]]
 name = "pallet-nis"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5612,7 +5612,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5629,7 +5629,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5649,7 +5649,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-runtime-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "pallet-nomination-pools",
  "parity-scale-codec",
@@ -5660,7 +5660,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5677,7 +5677,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5701,7 +5701,7 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5718,7 +5718,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5733,7 +5733,7 @@ dependencies = [
 [[package]]
 name = "pallet-ranked-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5751,7 +5751,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5766,7 +5766,7 @@ dependencies = [
 [[package]]
 name = "pallet-referenda"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -5785,7 +5785,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5802,7 +5802,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5823,7 +5823,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5839,7 +5839,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5853,7 +5853,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5876,7 +5876,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -5887,7 +5887,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -5896,7 +5896,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -5905,7 +5905,7 @@ dependencies = [
 [[package]]
 name = "pallet-state-trie-migration"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5922,7 +5922,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5936,7 +5936,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5954,7 +5954,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5973,7 +5973,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5989,7 +5989,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -6005,7 +6005,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -6017,7 +6017,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6034,7 +6034,7 @@ dependencies = [
 [[package]]
 name = "pallet-uniques"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6049,7 +6049,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6065,7 +6065,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6080,7 +6080,7 @@ dependencies = [
 [[package]]
 name = "pallet-whitelist"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6603,8 +6603,8 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
+ "sp-consensus-grandpa",
  "sp-core",
- "sp-finality-grandpa",
  "sp-inherents",
  "sp-keyring",
  "sp-mmr-primitives",
@@ -7389,8 +7389,8 @@ dependencies = [
  "sc-consensus-babe",
  "sc-consensus-babe-rpc",
  "sc-consensus-epochs",
- "sc-finality-grandpa",
- "sc-finality-grandpa-rpc",
+ "sc-consensus-grandpa",
+ "sc-consensus-grandpa-rpc",
  "sc-rpc",
  "sc-sync-state-rpc",
  "sc-transaction-pool-api",
@@ -7703,9 +7703,9 @@ dependencies = [
  "sc-client-db",
  "sc-consensus",
  "sc-consensus-babe",
+ "sc-consensus-grandpa",
  "sc-consensus-slots",
  "sc-executor",
- "sc-finality-grandpa",
  "sc-keystore",
  "sc-network",
  "sc-network-common",
@@ -7724,8 +7724,8 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
+ "sp-consensus-grandpa",
  "sp-core",
- "sp-finality-grandpa",
  "sp-inherents",
  "sp-io",
  "sp-keystore",
@@ -7933,8 +7933,8 @@ dependencies = [
  "sc-client-api",
  "sc-consensus",
  "sc-consensus-babe",
+ "sc-consensus-grandpa",
  "sc-executor",
- "sc-finality-grandpa",
  "sc-network",
  "sc-network-common",
  "sc-service",
@@ -7946,8 +7946,8 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
+ "sp-consensus-grandpa",
  "sp-core",
- "sp-finality-grandpa",
  "sp-inherents",
  "sp-keyring",
  "sp-runtime",
@@ -8996,7 +8996,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "log",
  "sp-core",
@@ -9007,7 +9007,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "futures",
@@ -9034,7 +9034,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "futures",
  "futures-timer",
@@ -9057,7 +9057,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -9073,7 +9073,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "memmap2",
  "sc-chain-spec-derive",
@@ -9088,7 +9088,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -9099,7 +9099,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "array-bytes",
  "chrono",
@@ -9139,7 +9139,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "fnv",
  "futures",
@@ -9165,7 +9165,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -9191,7 +9191,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "futures",
@@ -9216,7 +9216,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -9255,7 +9255,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -9277,7 +9277,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -9287,10 +9287,70 @@ dependencies = [
  "sp-runtime",
 ]
 
+[[package]]
+name = "sc-consensus-grandpa"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
+dependencies = [
+ "ahash 0.8.2",
+ "array-bytes",
+ "async-trait",
+ "dyn-clone",
+ "finality-grandpa",
+ "fork-tree",
+ "futures",
+ "futures-timer",
+ "log",
+ "parity-scale-codec",
+ "parking_lot 0.12.1",
+ "rand 0.8.5",
+ "sc-block-builder",
+ "sc-chain-spec",
+ "sc-client-api",
+ "sc-consensus",
+ "sc-network",
+ "sc-network-common",
+ "sc-network-gossip",
+ "sc-telemetry",
+ "sc-utils",
+ "serde_json",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-arithmetic",
+ "sp-blockchain",
+ "sp-consensus",
+ "sp-consensus-grandpa",
+ "sp-core",
+ "sp-keystore",
+ "sp-runtime",
+ "substrate-prometheus-endpoint",
+ "thiserror",
+]
+
+[[package]]
+name = "sc-consensus-grandpa-rpc"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
+dependencies = [
+ "finality-grandpa",
+ "futures",
+ "jsonrpsee",
+ "log",
+ "parity-scale-codec",
+ "sc-client-api",
+ "sc-consensus-grandpa",
+ "sc-rpc",
+ "serde",
+ "sp-blockchain",
+ "sp-core",
+ "sp-runtime",
+ "thiserror",
+]
+
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "futures",
@@ -9313,7 +9373,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "lru 0.8.1",
  "parity-scale-codec",
@@ -9337,7 +9397,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "sc-allocator",
  "sp-maybe-compressed-blob",
@@ -9350,7 +9410,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "log",
  "sc-allocator",
@@ -9363,7 +9423,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -9378,70 +9438,10 @@ dependencies = [
  "wasmtime",
 ]
 
-[[package]]
-name = "sc-finality-grandpa"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
-dependencies = [
- "ahash 0.8.2",
- "array-bytes",
- "async-trait",
- "dyn-clone",
- "finality-grandpa",
- "fork-tree",
- "futures",
- "futures-timer",
- "log",
- "parity-scale-codec",
- "parking_lot 0.12.1",
- "rand 0.8.5",
- "sc-block-builder",
- "sc-chain-spec",
- "sc-client-api",
- "sc-consensus",
- "sc-network",
- "sc-network-common",
- "sc-network-gossip",
- "sc-telemetry",
- "sc-utils",
- "serde_json",
- "sp-api",
- "sp-application-crypto",
- "sp-arithmetic",
- "sp-blockchain",
- "sp-consensus",
- "sp-core",
- "sp-finality-grandpa",
- "sp-keystore",
- "sp-runtime",
- "substrate-prometheus-endpoint",
- "thiserror",
-]
-
-[[package]]
-name = "sc-finality-grandpa-rpc"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
-dependencies = [
- "finality-grandpa",
- "futures",
- "jsonrpsee",
- "log",
- "parity-scale-codec",
- "sc-client-api",
- "sc-finality-grandpa",
- "sc-rpc",
- "serde",
- "sp-blockchain",
- "sp-core",
- "sp-runtime",
- "thiserror",
-]
-
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "ansi_term",
  "futures",
@@ -9456,7 +9456,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -9471,7 +9471,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -9514,7 +9514,7 @@ dependencies = [
 [[package]]
 name = "sc-network-bitswap"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "cid",
  "futures",
@@ -9533,7 +9533,7 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "bitflags",
@@ -9550,7 +9550,7 @@ dependencies = [
  "smallvec",
  "sp-blockchain",
  "sp-consensus",
- "sp-finality-grandpa",
+ "sp-consensus-grandpa",
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -9559,7 +9559,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "ahash 0.8.2",
  "futures",
@@ -9577,7 +9577,7 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "array-bytes",
  "futures",
@@ -9598,7 +9598,7 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -9620,8 +9620,8 @@ dependencies = [
  "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
+ "sp-consensus-grandpa",
  "sp-core",
- "sp-finality-grandpa",
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -9630,7 +9630,7 @@ dependencies = [
 [[package]]
 name = "sc-network-transactions"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "array-bytes",
  "futures",
@@ -9649,7 +9649,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "array-bytes",
  "bytes",
@@ -9679,7 +9679,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "futures",
  "libp2p",
@@ -9692,7 +9692,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -9701,7 +9701,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -9731,7 +9731,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -9750,7 +9750,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "http",
  "jsonrpsee",
@@ -9765,7 +9765,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-spec-v2"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "array-bytes",
  "futures",
@@ -9791,7 +9791,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "directories",
@@ -9857,7 +9857,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9868,7 +9868,7 @@ dependencies = [
 [[package]]
 name = "sc-storage-monitor"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "clap 4.0.15",
  "futures",
@@ -9884,7 +9884,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -9892,7 +9892,7 @@ dependencies = [
  "sc-client-api",
  "sc-consensus-babe",
  "sc-consensus-epochs",
- "sc-finality-grandpa",
+ "sc-consensus-grandpa",
  "serde",
  "serde_json",
  "sp-blockchain",
@@ -9903,7 +9903,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "futures",
  "libc",
@@ -9922,7 +9922,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "chrono",
  "futures",
@@ -9941,7 +9941,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "ansi_term",
  "atty",
@@ -9972,7 +9972,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -9983,7 +9983,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "futures",
@@ -10010,7 +10010,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "futures",
@@ -10024,7 +10024,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "backtrace",
  "futures",
@@ -10532,7 +10532,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "hash-db",
  "log",
@@ -10550,7 +10550,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "blake2",
  "proc-macro-crate",
@@ -10562,7 +10562,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10575,7 +10575,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -10589,7 +10589,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10602,7 +10602,7 @@ dependencies = [
 [[package]]
 name = "sp-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "lazy_static",
  "parity-scale-codec",
@@ -10621,7 +10621,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10633,7 +10633,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "futures",
  "log",
@@ -10651,7 +10651,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "futures",
@@ -10669,7 +10669,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -10687,7 +10687,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "merlin",
@@ -10707,10 +10707,28 @@ dependencies = [
  "sp-timestamp",
 ]
 
+[[package]]
+name = "sp-consensus-grandpa"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
+dependencies = [
+ "finality-grandpa",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-keystore",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10722,7 +10740,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10735,7 +10753,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "array-bytes",
  "base58",
@@ -10778,7 +10796,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "blake2",
  "byteorder",
@@ -10792,7 +10810,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10803,7 +10821,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.1",
@@ -10812,7 +10830,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10822,7 +10840,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -10830,28 +10848,10 @@ dependencies = [
  "sp-storage",
 ]
 
-[[package]]
-name = "sp-finality-grandpa"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
-dependencies = [
- "finality-grandpa",
- "log",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-api",
- "sp-application-crypto",
- "sp-core",
- "sp-keystore",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -10866,7 +10866,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "bytes",
  "ed25519",
@@ -10891,7 +10891,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -10902,7 +10902,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "futures",
@@ -10919,7 +10919,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "thiserror",
  "zstd",
@@ -10928,7 +10928,7 @@ dependencies = [
 [[package]]
 name = "sp-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "ckb-merkle-mountain-range",
  "log",
@@ -10946,7 +10946,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10960,7 +10960,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -10970,7 +10970,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -10980,7 +10980,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -10990,7 +10990,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -11012,7 +11012,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -11030,7 +11030,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -11042,7 +11042,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11056,7 +11056,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11068,7 +11068,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "hash-db",
  "log",
@@ -11088,12 +11088,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 
 [[package]]
 name = "sp-storage"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -11106,7 +11106,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "futures-timer",
@@ -11121,7 +11121,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -11133,7 +11133,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -11142,7 +11142,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "log",
@@ -11158,7 +11158,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "ahash 0.8.2",
  "hash-db",
@@ -11181,7 +11181,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -11198,7 +11198,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -11209,7 +11209,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
@@ -11223,7 +11223,7 @@ dependencies = [
 [[package]]
 name = "sp-weights"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -11443,7 +11443,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "platforms",
 ]
@@ -11451,7 +11451,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
@@ -11470,7 +11470,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "hyper",
  "log",
@@ -11482,7 +11482,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-client"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "jsonrpsee",
@@ -11495,7 +11495,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-trie-migration-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "jsonrpsee",
  "log",
@@ -11514,7 +11514,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -11540,7 +11540,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "futures",
  "substrate-test-utils-derive",
@@ -11550,7 +11550,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -11561,7 +11561,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "ansi_term",
  "build-helper",
@@ -12362,7 +12362,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#1837f423b494254e1d27834b1c9da34b2c0c2375"
+source = "git+https://github.com/paritytech/substrate?branch=master#7c8b89b3a6b603902709fc33fdb10a864b8b4204"
 dependencies = [
  "async-trait",
  "clap 4.0.15",
diff --git a/node/client/Cargo.toml b/node/client/Cargo.toml
index b07447ef3396..7bd69a337179 100644
--- a/node/client/Cargo.toml
+++ b/node/client/Cargo.toml
@@ -25,7 +25,7 @@ sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "mast
 sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/node/client/src/lib.rs b/node/client/src/lib.rs
index 36b63c831b72..d6039b25031c 100644
--- a/node/client/src/lib.rs
+++ b/node/client/src/lib.rs
@@ -125,7 +125,7 @@ pub trait RuntimeApiCollection:
 	sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>
 	+ sp_api::ApiExt<Block>
 	+ sp_consensus_babe::BabeApi<Block>
-	+ sp_finality_grandpa::GrandpaApi<Block>
+	+ sp_consensus_grandpa::GrandpaApi<Block>
 	+ ParachainHost<Block>
 	+ sp_block_builder::BlockBuilder<Block>
 	+ frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Nonce>
@@ -146,7 +146,7 @@ where
 	Api: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>
 		+ sp_api::ApiExt<Block>
 		+ sp_consensus_babe::BabeApi<Block>
-		+ sp_finality_grandpa::GrandpaApi<Block>
+		+ sp_consensus_grandpa::GrandpaApi<Block>
 		+ ParachainHost<Block>
 		+ sp_block_builder::BlockBuilder<Block>
 		+ frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Nonce>
diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml
index 58298481444e..a532fcea8dbb 100644
--- a/node/service/Cargo.toml
+++ b/node/service/Cargo.toml
@@ -11,7 +11,7 @@ sc-authority-discovery = { git = "https://github.com/paritytech/substrate", bran
 babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" }
 beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", package = "sp-beefy" }
 beefy-gadget = { git = "https://github.com/paritytech/substrate", branch = "master" }
-grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
+grandpa = { package = "sc-consensus-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
 mmr-gadget = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "master"}
 sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -35,7 +35,7 @@ telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/sub
 # Substrate Primitives
 sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
 consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" }
-grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
+grandpa_primitives = { package = "sp-consensus-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
 inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/node/test/service/Cargo.toml b/node/test/service/Cargo.toml
index 10078a1c98df..ec85fe4295e0 100644
--- a/node/test/service/Cargo.toml
+++ b/node/test/service/Cargo.toml
@@ -33,8 +33,8 @@ babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/par
 consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" }
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" }
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
-grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
-grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
+grandpa = { package = "sc-consensus-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
+grandpa_primitives = { package = "sp-consensus-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
 inherents = { package = "sp-inherents", 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/rpc/Cargo.toml b/rpc/Cargo.toml
index a641afd12496..198c53559e61 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -19,8 +19,8 @@ sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-consensus-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-consensus-grandpa-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
 txpool-api = { package = "sc-transaction-pool-api", git = "https://github.com/paritytech/substrate", branch = "master" }
 frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index 40e4a35b7791..8d16369b3bfb 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -24,7 +24,7 @@ use jsonrpsee::RpcModule;
 use polkadot_primitives::{AccountId, Balance, Block, BlockNumber, Hash, Nonce};
 use sc_client_api::AuxStore;
 use sc_consensus_babe::{BabeConfiguration, Epoch};
-use sc_finality_grandpa::FinalityProofProvider;
+use sc_consensus_grandpa::FinalityProofProvider;
 pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor};
 use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
@@ -50,11 +50,11 @@ pub struct BabeDeps {
 /// Dependencies for GRANDPA
 pub struct GrandpaDeps<B> {
 	/// Voting round info.
-	pub shared_voter_state: sc_finality_grandpa::SharedVoterState,
+	pub shared_voter_state: sc_consensus_grandpa::SharedVoterState,
 	/// Authority set info.
-	pub shared_authority_set: sc_finality_grandpa::SharedAuthoritySet<Hash, BlockNumber>,
+	pub shared_authority_set: sc_consensus_grandpa::SharedAuthoritySet<Hash, BlockNumber>,
 	/// Receives notifications about justification events from Grandpa.
-	pub justification_stream: sc_finality_grandpa::GrandpaJustificationStream<Block>,
+	pub justification_stream: sc_consensus_grandpa::GrandpaJustificationStream<Block>,
 	/// Executor to drive the subscription manager in the Grandpa RPC handler.
 	pub subscription_executor: sc_rpc::SubscriptionTaskExecutor,
 	/// Finality proof provider.
@@ -122,7 +122,7 @@ where
 	use mmr_rpc::{Mmr, MmrApiServer};
 	use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
 	use sc_consensus_babe_rpc::{Babe, BabeApiServer};
-	use sc_finality_grandpa_rpc::{Grandpa, GrandpaApiServer};
+	use sc_consensus_grandpa_rpc::{Grandpa, GrandpaApiServer};
 	use sc_sync_state_rpc::{SyncState, SyncStateApiServer};
 	use substrate_state_trie_migration_rpc::{StateMigration, StateMigrationApiServer};