From 067b2ab92626d78cb323f008027f986eed204b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Silva=20de=20Souza?=
 <77391175+joao-paulo-parity@users.noreply.github.com>
Date: Tue, 6 Dec 2022 09:30:49 -0300
Subject: [PATCH] Companion of Substrate PR 12837 (#6385)

* rename some crates for publishing to crates.io

* s/remote-ext/frame-remote-externalities

* cargo update
---
 polkadot/.github/dependabot.yml          |   2 +-
 polkadot/Cargo.lock                      | 466 +++++++++++------------
 polkadot/node/client/Cargo.toml          |   2 +-
 polkadot/node/service/Cargo.toml         |   2 +-
 polkadot/runtime/common/Cargo.toml       |   2 +-
 polkadot/runtime/kusama/Cargo.toml       |   4 +-
 polkadot/runtime/polkadot/Cargo.toml     |   4 +-
 polkadot/runtime/rococo/Cargo.toml       |   2 +-
 polkadot/runtime/test-runtime/Cargo.toml |   2 +-
 polkadot/runtime/westend/Cargo.toml      |   4 +-
 polkadot/utils/staking-miner/Cargo.toml  |   2 +-
 11 files changed, 246 insertions(+), 246 deletions(-)

diff --git a/polkadot/.github/dependabot.yml b/polkadot/.github/dependabot.yml
index b49246776c5..3fb899fd436 100644
--- a/polkadot/.github/dependabot.yml
+++ b/polkadot/.github/dependabot.yml
@@ -10,7 +10,7 @@ updates:
       - dependency-name: "sp-*"
       - dependency-name: "frame-*"
       - dependency-name: "fork-tree"
-      - dependency-name: "remote-externalities"
+      - dependency-name: "frame-remote-externalities"
       - dependency-name: "pallet-*"
       - dependency-name: "beefy-*"
       - dependency-name: "try-runtime-*"
diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index 188e35631a2..f7a254ec181 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -410,11 +410,10 @@ dependencies = [
 [[package]]
 name = "beefy-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "array-bytes",
  "async-trait",
- "beefy-primitives",
  "fnv",
  "futures",
  "futures-timer",
@@ -433,6 +432,7 @@ dependencies = [
  "sp-api",
  "sp-application-crypto",
  "sp-arithmetic",
+ "sp-beefy",
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
@@ -447,10 +447,9 @@ dependencies = [
 [[package]]
 name = "beefy-gadget-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "beefy-gadget",
- "beefy-primitives",
  "futures",
  "jsonrpsee",
  "log",
@@ -459,6 +458,7 @@ dependencies = [
  "sc-rpc",
  "sc-utils",
  "serde",
+ "sp-beefy",
  "sp-core",
  "sp-runtime",
  "thiserror",
@@ -467,30 +467,13 @@ dependencies = [
 [[package]]
 name = "beefy-merkle-tree"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
- "beefy-primitives",
  "sp-api",
+ "sp-beefy",
  "sp-runtime",
 ]
 
-[[package]]
-name = "beefy-primitives"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
-dependencies = [
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-api",
- "sp-application-crypto",
- "sp-core",
- "sp-io",
- "sp-mmr-primitives",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -2007,7 +1990,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2031,7 +2014,7 @@ checksum = "85dcb89d2b10c5f6133de2efd8c11959ce9dbb46a2f7a4cab208c4eeda6ce1ab"
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2054,7 +2037,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "Inflector",
  "array-bytes",
@@ -2106,7 +2089,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -2117,7 +2100,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -2133,7 +2116,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2159,10 +2142,27 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "frame-remote-externalities"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
+dependencies = [
+ "env_logger 0.9.0",
+ "log",
+ "parity-scale-codec",
+ "serde",
+ "serde_json",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-version",
+ "substrate-rpc-client",
+]
+
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2194,7 +2194,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -2208,7 +2208,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -2220,7 +2220,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2230,7 +2230,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-support",
  "frame-support-test-pallet",
@@ -2253,7 +2253,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test-pallet"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2264,7 +2264,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-support",
  "log",
@@ -2282,7 +2282,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2297,7 +2297,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2306,7 +2306,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -2477,7 +2477,7 @@ dependencies = [
 [[package]]
 name = "generate-bags"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "chrono",
  "frame-election-provider-support",
@@ -3205,11 +3205,11 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7"
 name = "kusama-runtime"
 version = "0.9.33"
 dependencies = [
- "beefy-primitives",
  "bitvec",
  "frame-benchmarking",
  "frame-election-provider-support",
  "frame-executive",
+ "frame-remote-externalities",
  "frame-support",
  "frame-system",
  "frame-system-benchmarking",
@@ -3268,7 +3268,6 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-runtime-common",
  "polkadot-runtime-parachains",
- "remote-externalities",
  "rustc-hex",
  "scale-info",
  "separator",
@@ -3279,6 +3278,7 @@ dependencies = [
  "sp-api",
  "sp-arithmetic",
  "sp-authority-discovery",
+ "sp-beefy",
  "sp-block-builder",
  "sp-consensus-babe",
  "sp-core",
@@ -4086,15 +4086,15 @@ dependencies = [
 [[package]]
 name = "mmr-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
- "beefy-primitives",
  "futures",
  "log",
  "parity-scale-codec",
  "sc-client-api",
  "sc-offchain",
  "sp-api",
+ "sp-beefy",
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
@@ -4106,7 +4106,7 @@ dependencies = [
 [[package]]
 name = "mmr-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "anyhow",
  "jsonrpsee",
@@ -4611,7 +4611,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4"
 [[package]]
 name = "pallet-assets"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4625,7 +4625,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4641,7 +4641,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4656,7 +4656,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4680,7 +4680,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4700,15 +4700,15 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list-remote-tests"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-election-provider-support",
+ "frame-remote-externalities",
  "frame-support",
  "frame-system",
  "log",
  "pallet-bags-list",
  "pallet-staking",
- "remote-externalities",
  "sp-core",
  "sp-runtime",
  "sp-std",
@@ -4719,7 +4719,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4734,15 +4734,15 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
- "beefy-primitives",
  "frame-support",
  "frame-system",
  "pallet-session",
  "parity-scale-codec",
  "scale-info",
  "serde",
+ "sp-beefy",
  "sp-runtime",
  "sp-std",
 ]
@@ -4750,11 +4750,10 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "array-bytes",
  "beefy-merkle-tree",
- "beefy-primitives",
  "frame-support",
  "frame-system",
  "log",
@@ -4764,6 +4763,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
+ "sp-beefy",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -4773,7 +4773,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4791,7 +4791,7 @@ dependencies = [
 [[package]]
 name = "pallet-child-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4810,7 +4810,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4827,7 +4827,7 @@ dependencies = [
 [[package]]
 name = "pallet-conviction-voting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -4844,7 +4844,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4862,7 +4862,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4886,7 +4886,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4899,7 +4899,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4917,7 +4917,7 @@ dependencies = [
 [[package]]
 name = "pallet-fast-unstake"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4935,7 +4935,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4958,7 +4958,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -4974,7 +4974,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4994,7 +4994,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5011,7 +5011,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5028,7 +5028,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5045,7 +5045,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5061,7 +5061,7 @@ dependencies = [
 [[package]]
 name = "pallet-nis"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5077,7 +5077,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5094,7 +5094,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5114,7 +5114,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-runtime-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -5124,7 +5124,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5141,7 +5141,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5164,7 +5164,7 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5181,7 +5181,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5196,7 +5196,7 @@ dependencies = [
 [[package]]
 name = "pallet-ranked-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5214,7 +5214,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5229,7 +5229,7 @@ dependencies = [
 [[package]]
 name = "pallet-referenda"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -5247,7 +5247,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5263,7 +5263,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5284,7 +5284,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5300,7 +5300,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5314,7 +5314,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5337,7 +5337,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -5348,7 +5348,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -5357,7 +5357,7 @@ dependencies = [
 [[package]]
 name = "pallet-state-trie-migration"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5374,7 +5374,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5388,7 +5388,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5406,7 +5406,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5425,7 +5425,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5441,7 +5441,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -5457,7 +5457,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5469,7 +5469,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5486,7 +5486,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5502,7 +5502,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5517,7 +5517,7 @@ dependencies = [
 [[package]]
 name = "pallet-whitelist"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6019,7 +6019,6 @@ name = "polkadot-client"
 version = "0.9.33"
 dependencies = [
  "async-trait",
- "beefy-primitives",
  "frame-benchmarking",
  "frame-benchmarking-cli",
  "frame-system",
@@ -6040,6 +6039,7 @@ dependencies = [
  "sc-service",
  "sp-api",
  "sp-authority-discovery",
+ "sp-beefy",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
@@ -6844,11 +6844,11 @@ dependencies = [
 name = "polkadot-runtime"
 version = "0.9.33"
 dependencies = [
- "beefy-primitives",
  "bitvec",
  "frame-benchmarking",
  "frame-election-provider-support",
  "frame-executive",
+ "frame-remote-externalities",
  "frame-support",
  "frame-system",
  "frame-system-benchmarking",
@@ -6900,7 +6900,6 @@ dependencies = [
  "polkadot-runtime-common",
  "polkadot-runtime-constants",
  "polkadot-runtime-parachains",
- "remote-externalities",
  "rustc-hex",
  "scale-info",
  "separator",
@@ -6910,6 +6909,7 @@ dependencies = [
  "smallvec",
  "sp-api",
  "sp-authority-discovery",
+ "sp-beefy",
  "sp-block-builder",
  "sp-consensus-babe",
  "sp-core",
@@ -6940,7 +6940,6 @@ dependencies = [
 name = "polkadot-runtime-common"
 version = "0.9.33"
 dependencies = [
- "beefy-primitives",
  "bitvec",
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -6975,6 +6974,7 @@ dependencies = [
  "serde_json",
  "slot-range-helper",
  "sp-api",
+ "sp-beefy",
  "sp-core",
  "sp-inherents",
  "sp-io",
@@ -7069,7 +7069,6 @@ dependencies = [
  "assert_matches",
  "async-trait",
  "beefy-gadget",
- "beefy-primitives",
  "env_logger 0.9.0",
  "frame-support",
  "frame-system-rpc-runtime-api",
@@ -7150,6 +7149,7 @@ dependencies = [
  "serde_json",
  "sp-api",
  "sp-authority-discovery",
+ "sp-beefy",
  "sp-block-builder",
  "sp-blockchain",
  "sp-consensus",
@@ -7275,7 +7275,6 @@ dependencies = [
 name = "polkadot-test-runtime"
 version = "0.9.33"
 dependencies = [
- "beefy-primitives",
  "bitvec",
  "frame-election-provider-support",
  "frame-executive",
@@ -7313,6 +7312,7 @@ dependencies = [
  "smallvec",
  "sp-api",
  "sp-authority-discovery",
+ "sp-beefy",
  "sp-block-builder",
  "sp-consensus-babe",
  "sp-core",
@@ -7993,23 +7993,6 @@ dependencies = [
  "westend-runtime-constants",
 ]
 
-[[package]]
-name = "remote-externalities"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
-dependencies = [
- "env_logger 0.9.0",
- "log",
- "parity-scale-codec",
- "serde",
- "serde_json",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-version",
- "substrate-rpc-client",
-]
-
 [[package]]
 name = "remove_dir_all"
 version = "0.5.3"
@@ -8107,7 +8090,6 @@ name = "rococo-runtime"
 version = "0.9.33"
 dependencies = [
  "beefy-merkle-tree",
- "beefy-primitives",
  "frame-benchmarking",
  "frame-executive",
  "frame-support",
@@ -8168,6 +8150,7 @@ dependencies = [
  "smallvec",
  "sp-api",
  "sp-authority-discovery",
+ "sp-beefy",
  "sp-block-builder",
  "sp-consensus-babe",
  "sp-core",
@@ -8336,7 +8319,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "log",
  "sp-core",
@@ -8347,7 +8330,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "async-trait",
  "futures",
@@ -8374,7 +8357,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "futures",
  "futures-timer",
@@ -8397,7 +8380,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -8413,7 +8396,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "impl-trait-for-tuples",
  "memmap2",
@@ -8430,7 +8413,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -8441,7 +8424,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "array-bytes",
  "chrono",
@@ -8481,7 +8464,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "fnv",
  "futures",
@@ -8509,7 +8492,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -8534,7 +8517,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "async-trait",
  "futures",
@@ -8558,7 +8541,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -8599,7 +8582,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -8621,7 +8604,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -8634,7 +8617,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "async-trait",
  "futures",
@@ -8658,7 +8641,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "lazy_static",
  "lru",
@@ -8684,7 +8667,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8700,7 +8683,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8715,7 +8698,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "cfg-if",
  "libc",
@@ -8735,7 +8718,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "ahash",
  "array-bytes",
@@ -8776,7 +8759,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "finality-grandpa",
  "futures",
@@ -8797,7 +8780,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "ansi_term",
  "futures",
@@ -8814,7 +8797,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -8829,7 +8812,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -8876,7 +8859,7 @@ dependencies = [
 [[package]]
 name = "sc-network-bitswap"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "cid",
  "futures",
@@ -8896,7 +8879,7 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "async-trait",
  "bitflags",
@@ -8922,7 +8905,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "ahash",
  "futures",
@@ -8940,7 +8923,7 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "array-bytes",
  "futures",
@@ -8961,7 +8944,7 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -8992,7 +8975,7 @@ dependencies = [
 [[package]]
 name = "sc-network-transactions"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "array-bytes",
  "futures",
@@ -9011,7 +8994,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "array-bytes",
  "bytes",
@@ -9041,7 +9024,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "futures",
  "libp2p",
@@ -9054,7 +9037,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -9063,7 +9046,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "futures",
  "hash-db",
@@ -9093,7 +9076,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -9116,7 +9099,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -9129,7 +9112,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-spec-v2"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "futures",
  "hex",
@@ -9148,7 +9131,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "async-trait",
  "directories",
@@ -9219,7 +9202,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9233,7 +9216,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -9252,7 +9235,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "futures",
  "libc",
@@ -9271,7 +9254,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "chrono",
  "futures",
@@ -9289,7 +9272,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "ansi_term",
  "atty",
@@ -9320,7 +9303,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -9331,7 +9314,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "async-trait",
  "futures",
@@ -9358,7 +9341,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "async-trait",
  "futures",
@@ -9372,7 +9355,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "futures",
  "futures-timer",
@@ -9853,7 +9836,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "hash-db",
  "log",
@@ -9871,7 +9854,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "blake2",
  "proc-macro-crate",
@@ -9883,7 +9866,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9896,7 +9879,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -9911,7 +9894,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9924,7 +9907,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -9933,10 +9916,27 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "sp-beefy"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-io",
+ "sp-mmr-primitives",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9948,7 +9948,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "futures",
  "log",
@@ -9966,7 +9966,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "async-trait",
  "futures",
@@ -9985,7 +9985,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "async-trait",
  "merlin",
@@ -10008,7 +10008,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10022,7 +10022,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10035,7 +10035,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "array-bytes",
  "base58",
@@ -10080,7 +10080,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "blake2",
  "byteorder",
@@ -10094,7 +10094,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10105,7 +10105,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.1",
@@ -10114,7 +10114,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10124,7 +10124,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -10135,7 +10135,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -10153,7 +10153,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -10167,7 +10167,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "bytes",
  "ed25519-dalek",
@@ -10194,7 +10194,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -10205,7 +10205,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "async-trait",
  "futures",
@@ -10222,7 +10222,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "thiserror",
  "zstd",
@@ -10231,7 +10231,7 @@ dependencies = [
 [[package]]
 name = "sp-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "ckb-merkle-mountain-range",
  "log",
@@ -10249,7 +10249,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10263,7 +10263,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -10273,7 +10273,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -10283,7 +10283,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -10293,7 +10293,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -10316,7 +10316,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -10334,7 +10334,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -10346,7 +10346,7 @@ dependencies = [
 [[package]]
 name = "sp-sandbox"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -10360,7 +10360,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10374,7 +10374,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10385,7 +10385,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "hash-db",
  "log",
@@ -10407,12 +10407,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 
 [[package]]
 name = "sp-storage"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10425,7 +10425,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "async-trait",
  "futures-timer",
@@ -10441,7 +10441,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -10453,7 +10453,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -10462,7 +10462,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "async-trait",
  "log",
@@ -10478,7 +10478,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "ahash",
  "hash-db",
@@ -10501,7 +10501,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10518,7 +10518,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -10529,7 +10529,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
@@ -10542,7 +10542,7 @@ dependencies = [
 [[package]]
 name = "sp-weights"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -10600,6 +10600,7 @@ dependencies = [
  "clap",
  "exitcode",
  "frame-election-provider-support",
+ "frame-remote-externalities",
  "frame-support",
  "frame-system",
  "futures-util",
@@ -10615,7 +10616,6 @@ dependencies = [
  "polkadot-core-primitives",
  "polkadot-runtime",
  "polkadot-runtime-common",
- "remote-externalities",
  "sc-transaction-pool-api",
  "serde",
  "serde_json",
@@ -10757,7 +10757,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "platforms",
 ]
@@ -10765,7 +10765,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
@@ -10786,7 +10786,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "futures-util",
  "hyper",
@@ -10799,7 +10799,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-client"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "async-trait",
  "jsonrpsee",
@@ -10812,7 +10812,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-trie-migration-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "jsonrpsee",
  "log",
@@ -10833,7 +10833,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -10859,7 +10859,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "futures",
  "substrate-test-utils-derive",
@@ -10869,7 +10869,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -10880,7 +10880,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "ansi_term",
  "build-helper",
@@ -11589,13 +11589,13 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#404b8c947cebdec396117c45e11766ee33542f2c"
+source = "git+https://github.com/paritytech/substrate?branch=master#416a331399452521f3e9cf7e1394d020373a95c5"
 dependencies = [
  "clap",
+ "frame-remote-externalities",
  "frame-try-runtime",
  "log",
  "parity-scale-codec",
- "remote-externalities",
  "sc-chain-spec",
  "sc-cli",
  "sc-executor",
@@ -12263,11 +12263,11 @@ dependencies = [
 name = "westend-runtime"
 version = "0.9.33"
 dependencies = [
- "beefy-primitives",
  "bitvec",
  "frame-benchmarking",
  "frame-election-provider-support",
  "frame-executive",
+ "frame-remote-externalities",
  "frame-support",
  "frame-system",
  "frame-system-benchmarking",
@@ -12320,7 +12320,6 @@ dependencies = [
  "polkadot-primitives",
  "polkadot-runtime-common",
  "polkadot-runtime-parachains",
- "remote-externalities",
  "rustc-hex",
  "scale-info",
  "serde",
@@ -12329,6 +12328,7 @@ dependencies = [
  "smallvec",
  "sp-api",
  "sp-authority-discovery",
+ "sp-beefy",
  "sp-block-builder",
  "sp-consensus-babe",
  "sp-core",
diff --git a/polkadot/node/client/Cargo.toml b/polkadot/node/client/Cargo.toml
index 840fc304d9e..b07447ef339 100644
--- a/polkadot/node/client/Cargo.toml
+++ b/polkadot/node/client/Cargo.toml
@@ -37,7 +37,7 @@ sc-executor = { git = "https://github.com/paritytech/substrate", branch = "maste
 sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 
-beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master" }
+beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", package = "sp-beefy" }
 
 # Polkadot Runtimes
 polkadot-runtime = { path = "../../runtime/polkadot", optional = true }
diff --git a/polkadot/node/service/Cargo.toml b/polkadot/node/service/Cargo.toml
index 47ca1011c7a..cf6c1c2b85e 100644
--- a/polkadot/node/service/Cargo.toml
+++ b/polkadot/node/service/Cargo.toml
@@ -9,7 +9,7 @@ edition.workspace = true
 # Substrate Client
 sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
 babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master" }
-beefy-primitives = { 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" }
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "master" }
 grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/polkadot/runtime/common/Cargo.toml b/polkadot/runtime/common/Cargo.toml
index e6dc629bdbe..8348a001183 100644
--- a/polkadot/runtime/common/Cargo.toml
+++ b/polkadot/runtime/common/Cargo.toml
@@ -15,7 +15,7 @@ serde = { version = "1.0.137", default-features = false }
 serde_derive = { version = "1.0.117", optional = true }
 static_assertions = "1.1.0"
 
-beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, package = "sp-beefy" }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-std = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
diff --git a/polkadot/runtime/kusama/Cargo.toml b/polkadot/runtime/kusama/Cargo.toml
index 868b5112bbd..6f4a7be8f1f 100644
--- a/polkadot/runtime/kusama/Cargo.toml
+++ b/polkadot/runtime/kusama/Cargo.toml
@@ -18,7 +18,7 @@ smallvec = "1.8.0"
 
 authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, package = "sp-beefy" }
 kusama-runtime-constants = { package = "kusama-runtime-constants", path = "./constants", default-features = false }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -108,7 +108,7 @@ keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substra
 sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
 separator = "0.4.1"
 serde_json = "1.0.81"
-remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master" }
+remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master", package = "frame-remote-externalities" }
 tokio = { version = "1.22.0", features = ["macros"] }
 sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 
diff --git a/polkadot/runtime/polkadot/Cargo.toml b/polkadot/runtime/polkadot/Cargo.toml
index 0dc4b757df2..99b8629a20e 100644
--- a/polkadot/runtime/polkadot/Cargo.toml
+++ b/polkadot/runtime/polkadot/Cargo.toml
@@ -18,7 +18,7 @@ smallvec = "1.8.0"
 
 authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, package = "sp-beefy" }
 block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -100,7 +100,7 @@ keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substra
 sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
 serde_json = "1.0.81"
 separator = "0.4.1"
-remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master" }
+remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master", package = "frame-remote-externalities" }
 tokio = { version = "1.22.0", features = ["macros"] }
 sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 
diff --git a/polkadot/runtime/rococo/Cargo.toml b/polkadot/runtime/rococo/Cargo.toml
index ba433a81e5a..aaf6710b7c1 100644
--- a/polkadot/runtime/rococo/Cargo.toml
+++ b/polkadot/runtime/rococo/Cargo.toml
@@ -16,7 +16,7 @@ smallvec = "1.8.0"
 
 authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, package = "sp-beefy" }
 beefy-merkle-tree = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 rococo-runtime-constants = { package = "rococo-runtime-constants", path = "./constants", default-features = false }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
diff --git a/polkadot/runtime/test-runtime/Cargo.toml b/polkadot/runtime/test-runtime/Cargo.toml
index 21b75926722..f8695b07c88 100644
--- a/polkadot/runtime/test-runtime/Cargo.toml
+++ b/polkadot/runtime/test-runtime/Cargo.toml
@@ -17,7 +17,7 @@ smallvec = "1.8.0"
 
 authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, package = "sp-beefy" }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
diff --git a/polkadot/runtime/westend/Cargo.toml b/polkadot/runtime/westend/Cargo.toml
index c20da9a16e2..442c69c3cbc 100644
--- a/polkadot/runtime/westend/Cargo.toml
+++ b/polkadot/runtime/westend/Cargo.toml
@@ -17,7 +17,7 @@ smallvec = "1.8.0"
 
 authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, package = "sp-beefy" }
 inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -100,7 +100,7 @@ tiny-keccak = { version = "2.0.2", features = ["keccak"] }
 keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
 serde_json = "1.0.81"
-remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master" }
+remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master", package = "frame-remote-externalities" }
 tokio = { version = "1.22.0", features = ["macros"] }
 sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 
diff --git a/polkadot/utils/staking-miner/Cargo.toml b/polkadot/utils/staking-miner/Cargo.toml
index 48334c65ac6..ca0fa1abaf7 100644
--- a/polkadot/utils/staking-miner/Cargo.toml
+++ b/polkadot/utils/staking-miner/Cargo.toml
@@ -15,7 +15,7 @@ serde = "1.0.137"
 serde_json = "1.0"
 thiserror = "1.0.31"
 tokio = { version = "1.22.0", features = ["macros", "rt-multi-thread", "sync"] }
-remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master" }
+remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master", package = "frame-remote-externalities" }
 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-version = { git = "https://github.com/paritytech/substrate", branch = "master" }
-- 
GitLab