diff --git a/.config/taplo.toml b/.config/taplo.toml
index 7cbc1b075125ad237f16d5d7dd33b0de7089ac38..4b8afc74a52ead13766e1af769ca2af6b31835d9 100644
--- a/.config/taplo.toml
+++ b/.config/taplo.toml
@@ -40,3 +40,10 @@ keys = ["workspace.dependencies"]
 
 [rule.formatting]
 reorder_keys = true
+
+[[rule]]
+include = ["**/Cargo.toml"]
+keys = ["build-dependencies", "dependencies", "dev-dependencies"]
+
+[rule.formatting]
+reorder_keys = true
diff --git a/bridges/chains/chain-bridge-hub-cumulus/Cargo.toml b/bridges/chains/chain-bridge-hub-cumulus/Cargo.toml
index 99ba721991ee90b04e708beb37dcca2f0aa5c96c..b9eb1d2d69c1290e3518766c167e6b827723158d 100644
--- a/bridges/chains/chain-bridge-hub-cumulus/Cargo.toml
+++ b/bridges/chains/chain-bridge-hub-cumulus/Cargo.toml
@@ -16,14 +16,14 @@ workspace = true
 [dependencies]
 # Bridge Dependencies
 
-bp-polkadot-core = { workspace = true }
 bp-messages = { workspace = true }
+bp-polkadot-core = { workspace = true }
 bp-runtime = { workspace = true }
 
 # Substrate Based Dependencies
 
-frame-system = { workspace = true }
 frame-support = { workspace = true }
+frame-system = { workspace = true }
 sp-api = { workspace = true }
 sp-std = { workspace = true }
 
diff --git a/bridges/chains/chain-bridge-hub-kusama/Cargo.toml b/bridges/chains/chain-bridge-hub-kusama/Cargo.toml
index 39f7b44daa5543b83108761d7acf5f72d5a8458f..136832d0199dca7e6cbad5ed298358c04c51468a 100644
--- a/bridges/chains/chain-bridge-hub-kusama/Cargo.toml
+++ b/bridges/chains/chain-bridge-hub-kusama/Cargo.toml
@@ -17,8 +17,8 @@ workspace = true
 # Bridge Dependencies
 
 bp-bridge-hub-cumulus = { workspace = true }
-bp-runtime = { workspace = true }
 bp-messages = { workspace = true }
+bp-runtime = { workspace = true }
 
 # Substrate Based Dependencies
 
diff --git a/bridges/chains/chain-bridge-hub-polkadot/Cargo.toml b/bridges/chains/chain-bridge-hub-polkadot/Cargo.toml
index 3b0ac96e7cd367cd373cdaedcbeaf299af7debe0..04ce144b790609f5fbbd10b3be15470b0419e568 100644
--- a/bridges/chains/chain-bridge-hub-polkadot/Cargo.toml
+++ b/bridges/chains/chain-bridge-hub-polkadot/Cargo.toml
@@ -18,8 +18,8 @@ workspace = true
 # Bridge Dependencies
 
 bp-bridge-hub-cumulus = { workspace = true }
-bp-runtime = { workspace = true }
 bp-messages = { workspace = true }
+bp-runtime = { workspace = true }
 
 # Substrate Based Dependencies
 
diff --git a/bridges/chains/chain-bridge-hub-rococo/Cargo.toml b/bridges/chains/chain-bridge-hub-rococo/Cargo.toml
index 23fbd9a2742f7ccf137bad53372e6e80d62a65c0..08a704add2b75b78d0f027a30d78657ff022cc22 100644
--- a/bridges/chains/chain-bridge-hub-rococo/Cargo.toml
+++ b/bridges/chains/chain-bridge-hub-rococo/Cargo.toml
@@ -18,8 +18,8 @@ codec = { features = ["derive"], workspace = true }
 
 # Bridge Dependencies
 bp-bridge-hub-cumulus = { workspace = true }
-bp-runtime = { workspace = true }
 bp-messages = { workspace = true }
+bp-runtime = { workspace = true }
 bp-xcm-bridge-hub = { workspace = true }
 
 # Substrate Based Dependencies
diff --git a/bridges/chains/chain-bridge-hub-westend/Cargo.toml b/bridges/chains/chain-bridge-hub-westend/Cargo.toml
index 61357e6aa6c848c32614524cf8a755511bad81d3..35932371d0a9887ceffdf26b5678b9f54ffddb69 100644
--- a/bridges/chains/chain-bridge-hub-westend/Cargo.toml
+++ b/bridges/chains/chain-bridge-hub-westend/Cargo.toml
@@ -18,8 +18,8 @@ codec = { features = ["derive"], workspace = true }
 
 # Bridge Dependencies
 bp-bridge-hub-cumulus = { workspace = true }
-bp-runtime = { workspace = true }
 bp-messages = { workspace = true }
+bp-runtime = { workspace = true }
 bp-xcm-bridge-hub = { workspace = true }
 
 # Substrate Based Dependencies
diff --git a/bridges/modules/beefy/Cargo.toml b/bridges/modules/beefy/Cargo.toml
index cffc62d290828f032c5c57f27982e7f60f9b94ef..adbf79e28b5ace48e989b75649199551c2d96995 100644
--- a/bridges/modules/beefy/Cargo.toml
+++ b/bridges/modules/beefy/Cargo.toml
@@ -31,13 +31,13 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
 [dev-dependencies]
-sp-consensus-beefy = { workspace = true, default-features = true }
+bp-test-utils = { workspace = true, default-features = true }
 mmr-lib = { workspace = true }
 pallet-beefy-mmr = { workspace = true, default-features = true }
 pallet-mmr = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
+sp-consensus-beefy = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-bp-test-utils = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/modules/grandpa/Cargo.toml b/bridges/modules/grandpa/Cargo.toml
index 6d1419ae5b030733ad9fb38a6a459ab7ce34f99f..fdca48ac6f079de441742f217dd3bde717b7686b 100644
--- a/bridges/modules/grandpa/Cargo.toml
+++ b/bridges/modules/grandpa/Cargo.toml
@@ -19,8 +19,8 @@ scale-info = { features = ["derive"], workspace = true }
 
 # Bridge Dependencies
 
-bp-runtime = { workspace = true }
 bp-header-chain = { workspace = true }
+bp-runtime = { workspace = true }
 
 # Substrate Dependencies
 
diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml
index 9df318587e3895ee8d040a586f4d70770fc64f0f..6248c9e65e1678fe9141366003155a59996b46c5 100644
--- a/bridges/modules/messages/Cargo.toml
+++ b/bridges/modules/messages/Cargo.toml
@@ -33,8 +33,8 @@ bp-runtime = { features = ["test-helpers"], workspace = true }
 bp-test-utils = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-bridge-grandpa = { workspace = true }
-sp-io = { workspace = true }
 sp-core = { workspace = true }
+sp-io = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/modules/relayers/Cargo.toml b/bridges/modules/relayers/Cargo.toml
index 04e7b52ed86c4dbeebc2f6b26e7ddb54ebba155a..97ed61a9004e8be23334960fcebc8c8fc8a387a3 100644
--- a/bridges/modules/relayers/Cargo.toml
+++ b/bridges/modules/relayers/Cargo.toml
@@ -34,15 +34,15 @@ sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
 [dev-dependencies]
-bp-runtime = { workspace = true }
-pallet-balances = { workspace = true, default-features = true }
-sp-io = { workspace = true }
-sp-runtime = { workspace = true }
 bp-parachains = { workspace = true }
 bp-polkadot-core = { workspace = true }
+bp-runtime = { workspace = true }
 bp-test-utils = { workspace = true }
+pallet-balances = { workspace = true, default-features = true }
 pallet-utility = { workspace = true }
 sp-core = { workspace = true }
+sp-io = { workspace = true }
+sp-runtime = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/modules/xcm-bridge-hub/Cargo.toml b/bridges/modules/xcm-bridge-hub/Cargo.toml
index ef49b3396b5c8e7eaad9712d40ddbdcea4d9ef88..b5e3658744436ca6d226617eb30044f782069d26 100644
--- a/bridges/modules/xcm-bridge-hub/Cargo.toml
+++ b/bridges/modules/xcm-bridge-hub/Cargo.toml
@@ -34,13 +34,13 @@ xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
 
 [dev-dependencies]
-pallet-balances = { workspace = true }
-sp-io = { workspace = true }
-bp-runtime = { workspace = true }
 bp-header-chain = { workspace = true }
-pallet-xcm-bridge-hub-router = { workspace = true }
+bp-runtime = { workspace = true }
 bp-xcm-bridge-hub-router = { workspace = true }
+pallet-balances = { workspace = true }
+pallet-xcm-bridge-hub-router = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
+sp-io = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/beefy/Cargo.toml b/bridges/primitives/beefy/Cargo.toml
index 404acaff30af252f6e5c52d9b28e8ccc72d542ce..b32cf1e407eba927e1800965f34d8bffbbfc1af7 100644
--- a/bridges/primitives/beefy/Cargo.toml
+++ b/bridges/primitives/beefy/Cargo.toml
@@ -23,10 +23,10 @@ bp-runtime = { workspace = true }
 # Substrate Dependencies
 
 binary-merkle-tree = { workspace = true }
-sp-consensus-beefy = { workspace = true }
 frame-support = { workspace = true }
 pallet-beefy-mmr = { workspace = true }
 pallet-mmr = { workspace = true }
+sp-consensus-beefy = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 
diff --git a/bridges/primitives/header-chain/Cargo.toml b/bridges/primitives/header-chain/Cargo.toml
index 081bda479495f5bbd4599b4230d45f5c4e3c5e85..b17dcb2f7491c799439492efc23d7ef7014f09e7 100644
--- a/bridges/primitives/header-chain/Cargo.toml
+++ b/bridges/primitives/header-chain/Cargo.toml
@@ -23,8 +23,8 @@ bp-runtime = { workspace = true }
 # Substrate Dependencies
 
 frame-support = { workspace = true }
-sp-core = { features = ["serde"], workspace = true }
 sp-consensus-grandpa = { features = ["serde"], workspace = true }
+sp-core = { features = ["serde"], workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
 sp-std = { workspace = true }
 
diff --git a/bridges/primitives/messages/Cargo.toml b/bridges/primitives/messages/Cargo.toml
index 87c8cbe881803522888fd73497e80d9fd2cb2e08..dd1bd083371f6e80695e2f83af6be629b490a303 100644
--- a/bridges/primitives/messages/Cargo.toml
+++ b/bridges/primitives/messages/Cargo.toml
@@ -16,19 +16,19 @@ scale-info = { features = ["bit-vec", "derive"], workspace = true }
 serde = { features = ["alloc", "derive"], workspace = true }
 
 # Bridge dependencies
-bp-runtime = { workspace = true }
 bp-header-chain = { workspace = true }
+bp-runtime = { workspace = true }
 
 # Substrate Dependencies
 frame-support = { workspace = true }
 sp-core = { workspace = true }
-sp-std = { workspace = true }
 sp-io = { workspace = true }
+sp-std = { workspace = true }
 
 [dev-dependencies]
+bp-runtime = { workspace = true }
 hex = { workspace = true, default-features = true }
 hex-literal = { workspace = true, default-features = true }
-bp-runtime = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/primitives/relayers/Cargo.toml b/bridges/primitives/relayers/Cargo.toml
index 34be38bed4ac67fec9f0b5a1e1c1a8b0ca70e6d5..9219bae1e13182ec4e8f458d0f946a2a63537d71 100644
--- a/bridges/primitives/relayers/Cargo.toml
+++ b/bridges/primitives/relayers/Cargo.toml
@@ -21,8 +21,8 @@ bp-parachains = { workspace = true }
 bp-runtime = { workspace = true }
 
 # Substrate Dependencies
-frame-system = { workspace = true }
 frame-support = { workspace = true }
+frame-system = { workspace = true }
 pallet-utility = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
diff --git a/bridges/primitives/xcm-bridge-hub-router/Cargo.toml b/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
index ba0c51152bd2fa6fd6e03b942cd4ce1fb93b8fd9..b8a21ec35024dd286ab69fd0df01d9bb247f9533 100644
--- a/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
+++ b/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
@@ -15,8 +15,8 @@ codec = { features = ["bit-vec", "derive"], workspace = true }
 scale-info = { features = ["bit-vec", "derive"], workspace = true }
 
 # Substrate Dependencies
-sp-runtime = { workspace = true }
 sp-core = { workspace = true }
+sp-runtime = { workspace = true }
 
 # Polkadot Dependencies
 xcm = { workspace = true }
diff --git a/bridges/primitives/xcm-bridge-hub/Cargo.toml b/bridges/primitives/xcm-bridge-hub/Cargo.toml
index 79201a8756f9a61f1f5bc93aa2f631e9ad7fa441..800e2a3da3a3db1421c40ea959ef129902bf96d2 100644
--- a/bridges/primitives/xcm-bridge-hub/Cargo.toml
+++ b/bridges/primitives/xcm-bridge-hub/Cargo.toml
@@ -20,10 +20,10 @@ bp-messages = { workspace = true }
 bp-runtime = { workspace = true }
 
 # Substrate Dependencies
-sp-std = { workspace = true }
-sp-io = { workspace = true }
-sp-core = { workspace = true }
 frame-support = { workspace = true }
+sp-core = { workspace = true }
+sp-io = { workspace = true }
+sp-std = { workspace = true }
 
 # Polkadot Dependencies
 xcm = { workspace = true }
diff --git a/bridges/relays/client-substrate/Cargo.toml b/bridges/relays/client-substrate/Cargo.toml
index 6065c23773e3f6808ee0a56f07f0ef0325378fce..6a59688b2d8c1807df3882d7dfb242a63c98423b 100644
--- a/bridges/relays/client-substrate/Cargo.toml
+++ b/bridges/relays/client-substrate/Cargo.toml
@@ -18,16 +18,16 @@ futures = { workspace = true }
 jsonrpsee = { features = ["macros", "ws-client"], workspace = true }
 log = { workspace = true }
 num-traits = { workspace = true, default-features = true }
+quick_cache = { workspace = true }
 rand = { workspace = true, default-features = true }
-serde_json = { workspace = true }
 scale-info = { features = [
 	"derive",
 ], workspace = true, default-features = true }
+serde_json = { workspace = true }
+thiserror = { workspace = true }
 tokio = { features = [
 	"rt-multi-thread",
 ], workspace = true, default-features = true }
-thiserror = { workspace = true }
-quick_cache = { workspace = true }
 
 # Bridge dependencies
 
diff --git a/bridges/relays/lib-substrate-relay/Cargo.toml b/bridges/relays/lib-substrate-relay/Cargo.toml
index b0f93e5b5485f24b230b9b2868c6301b6ed64181..b418a2a3abb8a167cf7316478dd57f7c99e21b71 100644
--- a/bridges/relays/lib-substrate-relay/Cargo.toml
+++ b/bridges/relays/lib-substrate-relay/Cargo.toml
@@ -32,29 +32,29 @@ bp-relayers = { workspace = true, default-features = true }
 
 equivocation-detector = { workspace = true }
 finality-relay = { workspace = true }
-parachains-relay = { workspace = true }
-relay-utils = { workspace = true }
 messages-relay = { workspace = true }
+parachains-relay = { workspace = true }
 relay-substrate-client = { workspace = true }
+relay-utils = { workspace = true }
 
 pallet-bridge-grandpa = { workspace = true, default-features = true }
 pallet-bridge-messages = { workspace = true, default-features = true }
 pallet-bridge-parachains = { workspace = true, default-features = true }
 
-bp-runtime = { workspace = true, default-features = true }
 bp-messages = { workspace = true, default-features = true }
+bp-runtime = { workspace = true, default-features = true }
 
 # Substrate Dependencies
 frame-support = { workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
 pallet-grandpa = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 sp-consensus-grandpa = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-trie = { workspace = true }
 
 [dev-dependencies]
-scale-info = { features = ["derive"], workspace = true }
 pallet-transaction-payment = { workspace = true, default-features = true }
 relay-substrate-client = { features = ["test-helpers"], workspace = true }
+scale-info = { features = ["derive"], workspace = true }
diff --git a/bridges/relays/utils/Cargo.toml b/bridges/relays/utils/Cargo.toml
index 4c25566607dcdb574dce7f36183867fee0d29742..8592ca780eaa896e187e08aa68f05d0e607b3510 100644
--- a/bridges/relays/utils/Cargo.toml
+++ b/bridges/relays/utils/Cargo.toml
@@ -16,18 +16,18 @@ async-std = { workspace = true }
 async-trait = { workspace = true }
 backoff = { workspace = true }
 console = { workspace = true }
-isahc = { workspace = true }
-sp-tracing = { workspace = true, default-features = true }
 futures = { workspace = true }
+isahc = { workspace = true }
 jsonpath_lib = { workspace = true }
 log = { workspace = true }
 num-traits = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 sysinfo = { workspace = true }
+thiserror = { workspace = true }
 time = { features = ["formatting", "local-offset", "std"], workspace = true }
 tokio = { features = ["rt"], workspace = true, default-features = true }
-thiserror = { workspace = true }
 
 # Bridge dependencies
 
@@ -35,5 +35,5 @@ bp-runtime = { workspace = true, default-features = true }
 
 # Substrate dependencies
 
-sp-runtime = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
diff --git a/bridges/snowbridge/pallets/ethereum-client/Cargo.toml b/bridges/snowbridge/pallets/ethereum-client/Cargo.toml
index 262d9a7f380ded22b3a280b791e2525b3a75400c..ebd8a1c6ed11db000d9f71c33dc244bf01d77eb0 100644
--- a/bridges/snowbridge/pallets/ethereum-client/Cargo.toml
+++ b/bridges/snowbridge/pallets/ethereum-client/Cargo.toml
@@ -15,37 +15,37 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { optional = true, workspace = true, default-features = true }
-serde_json = { optional = true, workspace = true, default-features = true }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 hex-literal = { optional = true, workspace = true, default-features = true }
 log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
+serde_json = { optional = true, workspace = true, default-features = true }
 
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 sp-core = { workspace = true }
-sp-std = { workspace = true }
-sp-runtime = { workspace = true }
 sp-io = { optional = true, workspace = true }
+sp-runtime = { workspace = true }
+sp-std = { workspace = true }
 
+pallet-timestamp = { optional = true, workspace = true }
+snowbridge-beacon-primitives = { workspace = true }
 snowbridge-core = { workspace = true }
 snowbridge-ethereum = { workspace = true }
 snowbridge-pallet-ethereum-client-fixtures = { optional = true, workspace = true }
-snowbridge-beacon-primitives = { workspace = true }
 static_assertions = { workspace = true }
-pallet-timestamp = { optional = true, workspace = true }
 
 [dev-dependencies]
-rand = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
 hex-literal = { workspace = true, default-features = true }
 pallet-timestamp = { workspace = true, default-features = true }
+rand = { workspace = true, default-features = true }
+serde = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 snowbridge-pallet-ethereum-client-fixtures = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-serde = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml b/bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml
index 87f0cf9a551308d58e5eb080a9057f844d2543af..74bfe580ec369c1a9e83fa355969fa18e71538ec 100644
--- a/bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml
+++ b/bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 hex-literal = { workspace = true, default-features = true }
+snowbridge-beacon-primitives = { workspace = true }
+snowbridge-core = { workspace = true }
 sp-core = { workspace = true }
 sp-std = { workspace = true }
-snowbridge-core = { workspace = true }
-snowbridge-beacon-primitives = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/snowbridge/pallets/inbound-queue/Cargo.toml b/bridges/snowbridge/pallets/inbound-queue/Cargo.toml
index c0789940a9e816dd1fd32ca6465908c62c17e2cf..5d4e8ad676628301317bc1c2440c23ae9d5b6259 100644
--- a/bridges/snowbridge/pallets/inbound-queue/Cargo.toml
+++ b/bridges/snowbridge/pallets/inbound-queue/Cargo.toml
@@ -15,35 +15,35 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { optional = true, workspace = true, default-features = true }
+alloy-core = { workspace = true, features = ["sol-types"] }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 hex-literal = { optional = true, workspace = true, default-features = true }
 log = { workspace = true }
-alloy-core = { workspace = true, features = ["sol-types"] }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
 
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-balances = { workspace = true }
 sp-core = { workspace = true }
-sp-std = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
+sp-std = { workspace = true }
 
 xcm = { workspace = true }
 xcm-executor = { workspace = true }
 
-snowbridge-core = { workspace = true }
-snowbridge-router-primitives = { workspace = true }
 snowbridge-beacon-primitives = { workspace = true }
+snowbridge-core = { workspace = true }
 snowbridge-pallet-inbound-queue-fixtures = { optional = true, workspace = true }
+snowbridge-router-primitives = { workspace = true }
 
 [dev-dependencies]
 frame-benchmarking = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-snowbridge-pallet-ethereum-client = { workspace = true, default-features = true }
 hex-literal = { workspace = true, default-features = true }
+snowbridge-pallet-ethereum-client = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/snowbridge/pallets/inbound-queue/fixtures/Cargo.toml b/bridges/snowbridge/pallets/inbound-queue/fixtures/Cargo.toml
index 6162a17728b61e55da68af95bba5800d6e0e47cc..c698dbbf1003f4a3f4e8efff24e471f142d0cf4b 100644
--- a/bridges/snowbridge/pallets/inbound-queue/fixtures/Cargo.toml
+++ b/bridges/snowbridge/pallets/inbound-queue/fixtures/Cargo.toml
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 hex-literal = { workspace = true, default-features = true }
+snowbridge-beacon-primitives = { workspace = true }
+snowbridge-core = { workspace = true }
 sp-core = { workspace = true }
 sp-std = { workspace = true }
-snowbridge-core = { workspace = true }
-snowbridge-beacon-primitives = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/snowbridge/pallets/outbound-queue/Cargo.toml b/bridges/snowbridge/pallets/outbound-queue/Cargo.toml
index 78546e258daa30e966ddef1ed48c35cebcc17d65..f4910e6e645716338e1e7293d610c5dc84b550a9 100644
--- a/bridges/snowbridge/pallets/outbound-queue/Cargo.toml
+++ b/bridges/snowbridge/pallets/outbound-queue/Cargo.toml
@@ -15,24 +15,24 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { features = ["alloc", "derive"], workspace = true }
 codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["alloc", "derive"], workspace = true }
 
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
-sp-std = { workspace = true }
-sp-runtime = { workspace = true }
 sp-io = { workspace = true }
-sp-arithmetic = { workspace = true }
+sp-runtime = { workspace = true }
+sp-std = { workspace = true }
 
 bridge-hub-common = { workspace = true }
 
+ethabi = { workspace = true }
 snowbridge-core = { features = ["serde"], workspace = true }
 snowbridge-outbound-queue-merkle-tree = { workspace = true }
-ethabi = { workspace = true }
 
 [dev-dependencies]
 pallet-message-queue = { workspace = true }
diff --git a/bridges/snowbridge/pallets/outbound-queue/merkle-tree/Cargo.toml b/bridges/snowbridge/pallets/outbound-queue/merkle-tree/Cargo.toml
index 16241428df80871fae21ade130bf0f72c7f2f1ba..2a0616b4f954f58701d1dbb9edc4a4f5699be1c9 100644
--- a/bridges/snowbridge/pallets/outbound-queue/merkle-tree/Cargo.toml
+++ b/bridges/snowbridge/pallets/outbound-queue/merkle-tree/Cargo.toml
@@ -22,9 +22,9 @@ sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
-hex-literal = { workspace = true, default-features = true }
-hex = { workspace = true, default-features = true }
 array-bytes = { workspace = true, default-features = true }
+hex = { workspace = true, default-features = true }
+hex-literal = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 
diff --git a/bridges/snowbridge/pallets/outbound-queue/runtime-api/Cargo.toml b/bridges/snowbridge/pallets/outbound-queue/runtime-api/Cargo.toml
index d35bdde5a81e7a80a228efff19c3c1de0eceefef..18f7dde22c93cdafd37b4c6263a5fd1172e4b171 100644
--- a/bridges/snowbridge/pallets/outbound-queue/runtime-api/Cargo.toml
+++ b/bridges/snowbridge/pallets/outbound-queue/runtime-api/Cargo.toml
@@ -16,11 +16,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-sp-std = { workspace = true }
-sp-api = { workspace = true }
 frame-support = { workspace = true }
-snowbridge-outbound-queue-merkle-tree = { workspace = true }
 snowbridge-core = { workspace = true }
+snowbridge-outbound-queue-merkle-tree = { workspace = true }
+sp-api = { workspace = true }
+sp-std = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/snowbridge/pallets/system/Cargo.toml b/bridges/snowbridge/pallets/system/Cargo.toml
index d8e124d73d14ed4ff521c95dade17c342f6b1d6a..3544925956b41dc3ad3c734a00dc81e1f94ba952 100644
--- a/bridges/snowbridge/pallets/system/Cargo.toml
+++ b/bridges/snowbridge/pallets/system/Cargo.toml
@@ -18,16 +18,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 
 sp-core = { workspace = true }
-sp-std = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
+sp-std = { workspace = true }
 
 xcm = { workspace = true }
 xcm-executor = { workspace = true }
@@ -38,10 +38,10 @@ snowbridge-core = { workspace = true }
 hex = { workspace = true, default-features = true }
 hex-literal = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 pallet-message-queue = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 snowbridge-pallet-outbound-queue = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/snowbridge/pallets/system/runtime-api/Cargo.toml b/bridges/snowbridge/pallets/system/runtime-api/Cargo.toml
index 7c524dd2edadb6132be50616f7e6855ad463c8b4..fc377b460d33c49e7aadceb36ed1cb90b434f58c 100644
--- a/bridges/snowbridge/pallets/system/runtime-api/Cargo.toml
+++ b/bridges/snowbridge/pallets/system/runtime-api/Cargo.toml
@@ -18,10 +18,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-sp-std = { workspace = true }
+snowbridge-core = { workspace = true }
 sp-api = { workspace = true }
+sp-std = { workspace = true }
 xcm = { workspace = true }
-snowbridge-core = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/snowbridge/primitives/beacon/Cargo.toml b/bridges/snowbridge/primitives/beacon/Cargo.toml
index 9ced99fbf3fdddd8f64877606f957da14c70f608..bf5d6838f7bb23979960f6e67f4f205bc09d434b 100644
--- a/bridges/snowbridge/primitives/beacon/Cargo.toml
+++ b/bridges/snowbridge/primitives/beacon/Cargo.toml
@@ -12,24 +12,24 @@ categories = ["cryptography::cryptocurrencies"]
 workspace = true
 
 [dependencies]
-serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
-hex = { workspace = true }
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
+hex = { workspace = true }
 rlp = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
 
 frame-support = { workspace = true }
-sp-runtime = { workspace = true }
 sp-core = { workspace = true }
-sp-std = { workspace = true }
 sp-io = { workspace = true }
+sp-runtime = { workspace = true }
+sp-std = { workspace = true }
 
+byte-slice-cast = { workspace = true }
 ssz_rs = { workspace = true }
 ssz_rs_derive = { workspace = true }
-byte-slice-cast = { workspace = true }
 
-snowbridge-ethereum = { workspace = true }
 milagro-bls = { workspace = true }
+snowbridge-ethereum = { workspace = true }
 
 [dev-dependencies]
 hex-literal = { workspace = true, default-features = true }
diff --git a/bridges/snowbridge/primitives/core/Cargo.toml b/bridges/snowbridge/primitives/core/Cargo.toml
index af002a5a965c944ae5622c63839d37281acc9d22..514579400acac6b4ea78adb4befdbb0aba000675 100644
--- a/bridges/snowbridge/primitives/core/Cargo.toml
+++ b/bridges/snowbridge/primitives/core/Cargo.toml
@@ -12,10 +12,10 @@ categories = ["cryptography::cryptocurrencies"]
 workspace = true
 
 [dependencies]
-serde = { optional = true, features = ["alloc", "derive"], workspace = true }
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 hex-literal = { workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, features = ["alloc", "derive"], workspace = true }
 
 polkadot-parachain-primitives = { workspace = true }
 xcm = { workspace = true }
@@ -23,11 +23,11 @@ xcm-builder = { workspace = true }
 
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+sp-arithmetic = { workspace = true }
+sp-core = { workspace = true }
+sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
-sp-io = { workspace = true }
-sp-core = { workspace = true }
-sp-arithmetic = { workspace = true }
 
 snowbridge-beacon-primitives = { workspace = true }
 
diff --git a/bridges/snowbridge/primitives/ethereum/Cargo.toml b/bridges/snowbridge/primitives/ethereum/Cargo.toml
index 764ce90b8139d936d16e38a2f337c05004427675..44ea2d0d222ba4820b256f5e58a96778f07a532b 100644
--- a/bridges/snowbridge/primitives/ethereum/Cargo.toml
+++ b/bridges/snowbridge/primitives/ethereum/Cargo.toml
@@ -12,26 +12,26 @@ categories = ["cryptography::cryptocurrencies"]
 workspace = true
 
 [dependencies]
-serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
-serde-big-array = { optional = true, features = ["const-generics"], workspace = true }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 ethbloom = { workspace = true }
 ethereum-types = { features = ["codec", "rlp", "serialize"], workspace = true }
 hex-literal = { workspace = true }
 parity-bytes = { workspace = true }
 rlp = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
+serde-big-array = { optional = true, features = ["const-generics"], workspace = true }
 
 sp-io = { workspace = true }
-sp-std = { workspace = true }
 sp-runtime = { workspace = true }
+sp-std = { workspace = true }
 
 ethabi = { workspace = true }
 
 [dev-dependencies]
-wasm-bindgen-test = { workspace = true }
 rand = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
+wasm-bindgen-test = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/bridges/snowbridge/primitives/router/Cargo.toml b/bridges/snowbridge/primitives/router/Cargo.toml
index 1f7f489c6b18b6999bee0bafb3e1921a2e8d9d73..e44cca077ef323f2f7617914dd3625b0170081de 100644
--- a/bridges/snowbridge/primitives/router/Cargo.toml
+++ b/bridges/snowbridge/primitives/router/Cargo.toml
@@ -13,8 +13,8 @@ workspace = true
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 
 frame-support = { workspace = true }
 sp-core = { workspace = true }
diff --git a/bridges/snowbridge/runtime/runtime-common/Cargo.toml b/bridges/snowbridge/runtime/runtime-common/Cargo.toml
index 514a4c186696c821b713bd1d10d30171a423516f..23cd0adf1226d0353bbb7ec2e9ab028afc61cebb 100644
--- a/bridges/snowbridge/runtime/runtime-common/Cargo.toml
+++ b/bridges/snowbridge/runtime/runtime-common/Cargo.toml
@@ -12,11 +12,11 @@ categories = ["cryptography::cryptocurrencies"]
 workspace = true
 
 [dependencies]
-log = { workspace = true }
 codec = { workspace = true }
 frame-support = { workspace = true }
-sp-std = { workspace = true }
+log = { workspace = true }
 sp-arithmetic = { workspace = true }
+sp-std = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
diff --git a/bridges/snowbridge/runtime/test-common/Cargo.toml b/bridges/snowbridge/runtime/test-common/Cargo.toml
index cc1ed1288ca0315cf4e8878ff59f5b28dea95198..184a0ff2329f00b2de39ba0a74d682aea3c49fb7 100644
--- a/bridges/snowbridge/runtime/test-common/Cargo.toml
+++ b/bridges/snowbridge/runtime/test-common/Cargo.toml
@@ -19,8 +19,8 @@ codec = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-session = { workspace = true }
 pallet-message-queue = { workspace = true }
+pallet-session = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-utility = { workspace = true }
 sp-core = { workspace = true }
diff --git a/cumulus/bin/pov-validator/Cargo.toml b/cumulus/bin/pov-validator/Cargo.toml
index 9be92960ad772217635c796f0f7962384aaebfe8..d7af29a6bcb25949b5cf0861735fd97e1cf1bb3d 100644
--- a/cumulus/bin/pov-validator/Cargo.toml
+++ b/cumulus/bin/pov-validator/Cargo.toml
@@ -9,18 +9,18 @@ homepage.workspace = true
 description = "A tool for validating PoVs locally"
 
 [dependencies]
-codec.workspace = true
+anyhow.workspace = true
 clap = { workspace = true, features = ["derive"] }
-sc-executor.workspace = true
-sp-io.workspace = true
-sp-core.workspace = true
-sp-maybe-compressed-blob.workspace = true
+codec.workspace = true
 polkadot-node-primitives.workspace = true
 polkadot-parachain-primitives.workspace = true
 polkadot-primitives.workspace = true
-anyhow.workspace = true
-tracing.workspace = true
+sc-executor.workspace = true
+sp-core.workspace = true
+sp-io.workspace = true
+sp-maybe-compressed-blob.workspace = true
 tracing-subscriber.workspace = true
+tracing.workspace = true
 
 [lints]
 workspace = true
diff --git a/cumulus/client/cli/Cargo.toml b/cumulus/client/cli/Cargo.toml
index 198f9428f1dd4a9175549a775c0be97d50326355..bdc0236e368faeb24b6dc5e95aebe9e48c06a292 100644
--- a/cumulus/client/cli/Cargo.toml
+++ b/cumulus/client/cli/Cargo.toml
@@ -17,10 +17,10 @@ codec = { workspace = true, default-features = true }
 url = { workspace = true }
 
 # Substrate
+sc-chain-spec = { workspace = true, default-features = true }
 sc-cli = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
-sc-chain-spec = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-blockchain = { workspace = true, default-features = true }
diff --git a/cumulus/client/collator/Cargo.toml b/cumulus/client/collator/Cargo.toml
index 83a3f2661e7add99a1fd3f38b06376206dd74f98..ff591c2d6e3ac210d21adaa59127f853befc2bf5 100644
--- a/cumulus/client/collator/Cargo.toml
+++ b/cumulus/client/collator/Cargo.toml
@@ -12,15 +12,15 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-parking_lot = { workspace = true, default-features = true }
 codec = { features = ["derive"], workspace = true, default-features = true }
 futures = { workspace = true }
+parking_lot = { workspace = true, default-features = true }
 tracing = { workspace = true, default-features = true }
 
 # Substrate
 sc-client-api = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 
@@ -48,5 +48,5 @@ polkadot-node-subsystem-test-helpers = { workspace = true }
 
 # Cumulus
 cumulus-test-client = { workspace = true }
-cumulus-test-runtime = { workspace = true }
 cumulus-test-relay-sproof-builder = { workspace = true, default-features = true }
+cumulus-test-runtime = { workspace = true }
diff --git a/cumulus/client/consensus/aura/Cargo.toml b/cumulus/client/consensus/aura/Cargo.toml
index 33f24e30ccfbeedab36a7ab896a5d61a2ec5477d..7022309386455923c812a6e16c1bf2dd0823ab4e 100644
--- a/cumulus/client/consensus/aura/Cargo.toml
+++ b/cumulus/client/consensus/aura/Cargo.toml
@@ -16,18 +16,19 @@ async-trait = { workspace = true }
 codec = { features = ["derive"], workspace = true, default-features = true }
 futures = { workspace = true }
 parking_lot = { workspace = true }
-tracing = { workspace = true, default-features = true }
 schnellru = { workspace = true }
 tokio = { workspace = true, features = ["macros"] }
+tracing = { workspace = true, default-features = true }
 
 # Substrate
+prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-consensus-aura = { workspace = true, default-features = true }
 sc-consensus-babe = { workspace = true, default-features = true }
 sc-consensus-slots = { workspace = true, default-features = true }
-sc-utils = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
+sc-utils = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
 sp-block-builder = { workspace = true, default-features = true }
@@ -35,29 +36,28 @@ sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-consensus-aura = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-sp-trie = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-timestamp = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
+sp-timestamp = { workspace = true, default-features = true }
+sp-trie = { workspace = true, default-features = true }
 
 # Cumulus
+cumulus-client-collator = { workspace = true, default-features = true }
 cumulus-client-consensus-common = { workspace = true, default-features = true }
-cumulus-relay-chain-interface = { workspace = true, default-features = true }
 cumulus-client-consensus-proposer = { workspace = true, default-features = true }
 cumulus-client-parachain-inherent = { workspace = true, default-features = true }
 cumulus-primitives-aura = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
-cumulus-client-collator = { workspace = true, default-features = true }
+cumulus-relay-chain-interface = { workspace = true, default-features = true }
 
 # Polkadot
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 [features]
 # Allows collator to use full PoV size for block building
diff --git a/cumulus/client/consensus/common/Cargo.toml b/cumulus/client/consensus/common/Cargo.toml
index 0f532a2101c4cffbc6fe86ee993b6a7a434f1f8c..5bc5160601e757d92b7e732833a62589f846ea62 100644
--- a/cumulus/client/consensus/common/Cargo.toml
+++ b/cumulus/client/consensus/common/Cargo.toml
@@ -20,6 +20,7 @@ log = { workspace = true, default-features = true }
 tracing = { workspace = true, default-features = true }
 
 # Substrate
+prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-consensus-babe = { workspace = true, default-features = true }
@@ -31,15 +32,14 @@ sp-runtime = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true, default-features = true }
 sp-trie = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
 
 # Polkadot
 polkadot-primitives = { workspace = true, default-features = true }
 
 # Cumulus
+cumulus-client-pov-recovery = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
 cumulus-relay-chain-interface = { workspace = true, default-features = true }
-cumulus-client-pov-recovery = { workspace = true, default-features = true }
 schnellru = { workspace = true }
 
 [dev-dependencies]
diff --git a/cumulus/client/consensus/relay-chain/Cargo.toml b/cumulus/client/consensus/relay-chain/Cargo.toml
index 7f0f4333c961ef4ca99c42659a9350d5e75cd71f..fdc343dc65deccb47c431da58d8c554f1a3106ac 100644
--- a/cumulus/client/consensus/relay-chain/Cargo.toml
+++ b/cumulus/client/consensus/relay-chain/Cargo.toml
@@ -18,6 +18,7 @@ parking_lot = { workspace = true, default-features = true }
 tracing = { workspace = true, default-features = true }
 
 # Substrate
+prometheus-endpoint = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-block-builder = { workspace = true, default-features = true }
@@ -26,7 +27,6 @@ sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
 
 # Cumulus
 cumulus-client-consensus-common = { workspace = true, default-features = true }
diff --git a/cumulus/client/network/Cargo.toml b/cumulus/client/network/Cargo.toml
index b78df8d73eae98eae574653d07b3e49321576bd8..11025f8f62e6d542c979d561061ffe1b12f16af4 100644
--- a/cumulus/client/network/Cargo.toml
+++ b/cumulus/client/network/Cargo.toml
@@ -21,28 +21,28 @@ tracing = { workspace = true, default-features = true }
 
 # Substrate
 sc-client-api = { workspace = true, default-features = true }
+sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
-sp-api = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
 
 # Polkadot
 polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
 
 # Cumulus
 cumulus-relay-chain-interface = { workspace = true, default-features = true }
 
 [dev-dependencies]
 portpicker = { workspace = true }
+rstest = { workspace = true }
 tokio = { features = ["macros"], workspace = true, default-features = true }
 url = { workspace = true }
-rstest = { workspace = true }
 
 # Substrate
 sc-cli = { workspace = true, default-features = true }
diff --git a/cumulus/client/pov-recovery/Cargo.toml b/cumulus/client/pov-recovery/Cargo.toml
index 762837e0bb110aa21baed0b7736c5d5d882c1ca3..7e7da7244a86ee4e56ad6dbc7145dc9fad287221 100644
--- a/cumulus/client/pov-recovery/Cargo.toml
+++ b/cumulus/client/pov-recovery/Cargo.toml
@@ -21,10 +21,10 @@ tracing = { workspace = true, default-features = true }
 # Substrate
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
+sp-api = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-maybe-compressed-blob = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-api = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
 
 # Polkadot
@@ -34,19 +34,19 @@ polkadot-overseer = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
 
 # Cumulus
+async-trait = { workspace = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
 cumulus-relay-chain-interface = { workspace = true, default-features = true }
-async-trait = { workspace = true }
 
 [dev-dependencies]
-rstest = { workspace = true }
-tokio = { features = ["macros"], workspace = true, default-features = true }
-portpicker = { workspace = true }
-sp-blockchain = { workspace = true, default-features = true }
+assert_matches = { workspace = true }
 cumulus-test-client = { workspace = true }
+portpicker = { workspace = true }
+rstest = { workspace = true }
 sc-utils = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-assert_matches = { workspace = true }
+tokio = { features = ["macros"], workspace = true, default-features = true }
 
 # Cumulus
 cumulus-test-service = { workspace = true }
diff --git a/cumulus/client/relay-chain-inprocess-interface/Cargo.toml b/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
index 9e6e8da929bb5e946de2bce3ec281518698127de..2a590bbca5628eed2bbb2cabc22c06b4ecc12331 100644
--- a/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-inprocess-interface/Cargo.toml
@@ -19,9 +19,9 @@ futures-timer = { workspace = true }
 # Substrate
 sc-cli = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
+sc-sysinfo = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
 sc-tracing = { workspace = true, default-features = true }
-sc-sysinfo = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
@@ -42,9 +42,9 @@ cumulus-relay-chain-interface = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 
 # Polkadot
+metered = { features = ["futures_channel"], workspace = true }
 polkadot-primitives = { workspace = true, default-features = true }
 polkadot-test-client = { workspace = true }
-metered = { features = ["futures_channel"], workspace = true }
 
 # Cumulus
 cumulus-test-service = { workspace = true }
diff --git a/cumulus/client/relay-chain-interface/Cargo.toml b/cumulus/client/relay-chain-interface/Cargo.toml
index 2b9e72bbeca6a87187846844f001258054516c87..659d3b0f5b274a9d1ea3cfd2a574c2fa98a0cc5b 100644
--- a/cumulus/client/relay-chain-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-interface/Cargo.toml
@@ -16,14 +16,14 @@ polkadot-overseer = { workspace = true, default-features = true }
 
 cumulus-primitives-core = { workspace = true, default-features = true }
 
+sc-client-api = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
 sp-version = { workspace = true }
 
-futures = { workspace = true }
 async-trait = { workspace = true }
-thiserror = { workspace = true }
-jsonrpsee-core = { workspace = true }
 codec = { workspace = true, default-features = true }
+futures = { workspace = true }
+jsonrpsee-core = { workspace = true }
+thiserror = { workspace = true }
diff --git a/cumulus/client/relay-chain-minimal-node/Cargo.toml b/cumulus/client/relay-chain-minimal-node/Cargo.toml
index 0fad188bb1ab73de949a55113a5e79878ec17d0e..5b1e30cea9ba116cbe4bcc1b3626641658b469d2 100644
--- a/cumulus/client/relay-chain-minimal-node/Cargo.toml
+++ b/cumulus/client/relay-chain-minimal-node/Cargo.toml
@@ -13,37 +13,37 @@ workspace = true
 
 [dependencies]
 # polkadot deps
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-core-primitives = { workspace = true, default-features = true }
-polkadot-overseer = { workspace = true, default-features = true }
-polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
+polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-overseer = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 polkadot-network-bridge = { workspace = true, default-features = true }
 polkadot-service = { workspace = true, default-features = true }
 
 # substrate deps
+prometheus-endpoint = { workspace = true, default-features = true }
 sc-authority-discovery = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
 sc-tracing = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
+sp-consensus-babe = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-blockchain = { workspace = true, default-features = true }
 tokio = { features = ["macros"], workspace = true, default-features = true }
 
 # cumulus deps
+cumulus-primitives-core = { workspace = true, default-features = true }
 cumulus-relay-chain-interface = { workspace = true, default-features = true }
 cumulus-relay-chain-rpc-interface = { workspace = true, default-features = true }
-cumulus-primitives-core = { workspace = true, default-features = true }
 
 array-bytes = { workspace = true, default-features = true }
-tracing = { workspace = true, default-features = true }
 async-trait = { workspace = true }
 futures = { workspace = true }
+tracing = { workspace = true, default-features = true }
diff --git a/cumulus/client/relay-chain-rpc-interface/Cargo.toml b/cumulus/client/relay-chain-rpc-interface/Cargo.toml
index 162f5ad0e9e85a87c0ac409ba3442a0d0e5336fa..50b438e342370db35dcb657905b1fa5179271da1 100644
--- a/cumulus/client/relay-chain-rpc-interface/Cargo.toml
+++ b/cumulus/client/relay-chain-rpc-interface/Cargo.toml
@@ -20,36 +20,36 @@ polkadot-overseer = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
 cumulus-relay-chain-interface = { workspace = true, default-features = true }
 
+prometheus-endpoint = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
+sc-rpc-api = { workspace = true, default-features = true }
+sc-service = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
 sp-authority-discovery = { workspace = true, default-features = true }
+sp-consensus-babe = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
 sp-storage = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-sc-rpc-api = { workspace = true, default-features = true }
-sc-service = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
 
 tokio = { features = ["sync"], workspace = true, default-features = true }
 tokio-util = { features = ["compat"], workspace = true }
 
+async-trait = { workspace = true }
+codec = { workspace = true, default-features = true }
+either = { workspace = true, default-features = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
-codec = { workspace = true, default-features = true }
 jsonrpsee = { features = ["ws-client"], workspace = true }
-tracing = { workspace = true, default-features = true }
-async-trait = { workspace = true }
-url = { workspace = true }
-serde_json = { workspace = true, default-features = true }
-serde = { workspace = true, default-features = true }
+pin-project = { workspace = true }
+prometheus = { workspace = true }
+rand = { workspace = true, default-features = true }
 schnellru = { workspace = true }
+serde = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 smoldot = { default_features = false, features = ["std"], workspace = true }
 smoldot-light = { default_features = false, features = ["std"], workspace = true }
-either = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-rand = { workspace = true, default-features = true }
-pin-project = { workspace = true }
-prometheus = { workspace = true }
+tracing = { workspace = true, default-features = true }
+url = { workspace = true }
diff --git a/cumulus/client/service/Cargo.toml b/cumulus/client/service/Cargo.toml
index 193283648f1969bb724f00431f39f106fada6d20..c88386b985a4d7d66bed5a2069c0d95ae5118aff 100644
--- a/cumulus/client/service/Cargo.toml
+++ b/cumulus/client/service/Cargo.toml
@@ -18,22 +18,22 @@ futures-timer = { workspace = true }
 # Substrate
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
-sc-transaction-pool = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
+sc-network-sync = { workspace = true, default-features = true }
+sc-network-transactions = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
 sc-sysinfo = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
-sc-network-sync = { workspace = true, default-features = true }
+sc-transaction-pool = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
-sc-network-transactions = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-transaction-pool = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
 
 # Polkadot
 polkadot-primitives = { workspace = true, default-features = true }
@@ -42,10 +42,10 @@ polkadot-primitives = { workspace = true, default-features = true }
 cumulus-client-cli = { workspace = true, default-features = true }
 cumulus-client-collator = { workspace = true, default-features = true }
 cumulus-client-consensus-common = { workspace = true, default-features = true }
-cumulus-client-pov-recovery = { workspace = true, default-features = true }
 cumulus-client-network = { workspace = true, default-features = true }
+cumulus-client-pov-recovery = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
 cumulus-primitives-proof-size-hostfunction = { workspace = true, default-features = true }
-cumulus-relay-chain-interface = { workspace = true, default-features = true }
 cumulus-relay-chain-inprocess-interface = { workspace = true, default-features = true }
+cumulus-relay-chain-interface = { workspace = true, default-features = true }
 cumulus-relay-chain-minimal-node = { workspace = true, default-features = true }
diff --git a/cumulus/pallets/collator-selection/Cargo.toml b/cumulus/pallets/collator-selection/Cargo.toml
index 8d67db3daf8bb5b1284ef1dd6e7bfea7305b452f..651cceebbc6e39b2875636b64603d36a26b0f739 100644
--- a/cumulus/pallets/collator-selection/Cargo.toml
+++ b/cumulus/pallets/collator-selection/Cargo.toml
@@ -16,29 +16,29 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-log = { workspace = true }
 codec = { features = ["derive"], workspace = true }
+log = { workspace = true }
 rand = { features = ["std_rng"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
-sp-runtime = { workspace = true }
-sp-staking = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-session = { workspace = true }
+sp-runtime = { workspace = true }
+sp-staking = { workspace = true }
 
 frame-benchmarking = { optional = true, workspace = true }
 
 [dev-dependencies]
+pallet-aura = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
+sp-consensus-aura = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
-sp-consensus-aura = { workspace = true, default-features = true }
-pallet-aura = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/pallets/dmp-queue/Cargo.toml b/cumulus/pallets/dmp-queue/Cargo.toml
index ae85a108fe720b108858d43590cfa58540332b67..4f5bbc97bfc2df69efd42de35c3162ecf838de00 100644
--- a/cumulus/pallets/dmp-queue/Cargo.toml
+++ b/cumulus/pallets/dmp-queue/Cargo.toml
@@ -21,8 +21,8 @@ scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-sp-runtime = { workspace = true }
 sp-io = { workspace = true }
+sp-runtime = { workspace = true }
 
 # Polkadot
 xcm = { workspace = true }
diff --git a/cumulus/pallets/parachain-system/Cargo.toml b/cumulus/pallets/parachain-system/Cargo.toml
index c911f8531da2dd7bb5f7114b0797b32902d96e1d..6b6bc4fbcefe51f1cb2cc92931219ef783ea080c 100644
--- a/cumulus/pallets/parachain-system/Cargo.toml
+++ b/cumulus/pallets/parachain-system/Cargo.toml
@@ -17,8 +17,8 @@ codec = { features = ["derive"], workspace = true }
 environmental = { workspace = true }
 impl-trait-for-tuples = { workspace = true }
 log = { workspace = true }
-trie-db = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
+trie-db = { workspace = true }
 
 # Substrate
 frame-benchmarking = { optional = true, workspace = true }
@@ -49,18 +49,18 @@ cumulus-primitives-proof-size-hostfunction = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
+futures = { workspace = true }
 hex-literal = { workspace = true, default-features = true }
-trie-standardmap = { workspace = true }
 rand = { workspace = true, default-features = true }
-futures = { workspace = true }
+trie-standardmap = { workspace = true }
 
 # Substrate
 sc-client-api = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
+sp-consensus-slots = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
-sp-consensus-slots = { workspace = true, default-features = true }
 
 # Cumulus
 cumulus-test-client = { workspace = true }
diff --git a/cumulus/pallets/parachain-system/proc-macro/Cargo.toml b/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
index 629818f9c4ccc9c5f8450d526ecacf292b40c5d4..d4485a400cb8383fcfb6a1b2dbb9e37330baa545 100644
--- a/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
+++ b/cumulus/pallets/parachain-system/proc-macro/Cargo.toml
@@ -15,10 +15,10 @@ workspace = true
 proc-macro = true
 
 [dependencies]
-syn = { workspace = true }
+proc-macro-crate = { workspace = true }
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
-proc-macro-crate = { workspace = true }
+syn = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/pallets/session-benchmarking/Cargo.toml b/cumulus/pallets/session-benchmarking/Cargo.toml
index 5af94434e0afeacec3866f8f531f6afe1f88ee64..6d77e567c9b6bfc28d596882167e89f73a477e08 100644
--- a/cumulus/pallets/session-benchmarking/Cargo.toml
+++ b/cumulus/pallets/session-benchmarking/Cargo.toml
@@ -17,11 +17,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-sp-runtime = { workspace = true }
+frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
 pallet-session = { workspace = true }
+sp-runtime = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/pallets/xcm/Cargo.toml b/cumulus/pallets/xcm/Cargo.toml
index ff9be866d48fa4d8acfa3a4f981baf89a182fc85..25938763c956a5b71e5a2f38c9eff77428f4afc9 100644
--- a/cumulus/pallets/xcm/Cargo.toml
+++ b/cumulus/pallets/xcm/Cargo.toml
@@ -15,10 +15,10 @@ workspace = true
 codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
-sp-io = { workspace = true }
-sp-runtime = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+sp-io = { workspace = true }
+sp-runtime = { workspace = true }
 
 xcm = { workspace = true }
 
diff --git a/cumulus/pallets/xcmp-queue/Cargo.toml b/cumulus/pallets/xcmp-queue/Cargo.toml
index 432be3027e05543df9b240337232a701d49b9d3c..43dfae8927d22e7c70b334efed09977fc9f58572 100644
--- a/cumulus/pallets/xcmp-queue/Cargo.toml
+++ b/cumulus/pallets/xcmp-queue/Cargo.toml
@@ -19,24 +19,24 @@ scale-info = { features = ["derive"], workspace = true }
 # Substrate
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-sp-io = { workspace = true }
+pallet-message-queue = { workspace = true }
 sp-core = { workspace = true }
+sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-pallet-message-queue = { workspace = true }
 
 # Polkadot
 polkadot-runtime-common = { workspace = true }
 polkadot-runtime-parachains = { workspace = true }
 xcm = { workspace = true }
-xcm-executor = { workspace = true }
 xcm-builder = { workspace = true }
+xcm-executor = { workspace = true }
 
 # Cumulus
 cumulus-primitives-core = { workspace = true }
 
 # Optional import for benchmarking
-frame-benchmarking = { optional = true, workspace = true }
 bounded-collections = { workspace = true }
+frame-benchmarking = { optional = true, workspace = true }
 
 # Bridges
 bp-xcm-bridge-hub-router = { optional = true, workspace = true }
@@ -44,9 +44,9 @@ bp-xcm-bridge-hub-router = { optional = true, workspace = true }
 [dev-dependencies]
 
 # Substrate
-sp-core = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
 frame-support = { features = ["experimental"], workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 
 # Cumulus
 cumulus-pallet-parachain-system = { workspace = true, default-features = true }
diff --git a/cumulus/parachains/common/Cargo.toml b/cumulus/parachains/common/Cargo.toml
index ae4d7fc1d1156ac2ee8375f6ac0b6ea541ed53d5..6c52c3201c71909f5238d183728ea468329cf784 100644
--- a/cumulus/parachains/common/Cargo.toml
+++ b/cumulus/parachains/common/Cargo.toml
@@ -39,9 +39,9 @@ xcm = { workspace = true }
 xcm-executor = { workspace = true }
 
 # Cumulus
-pallet-collator-selection = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 cumulus-primitives-utility = { workspace = true }
+pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
 
 [dev-dependencies]
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/Cargo.toml
index 25796e7d64b4575163a51de1a548b7d1987f88de..a164a8197f72e6e22bf9b4a1e3a49815583992dc 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/Cargo.toml
@@ -13,15 +13,15 @@ workspace = true
 [dependencies]
 
 # Substrate
+frame-support = { workspace = true }
 sp-core = { workspace = true }
 sp-keyring = { workspace = true }
-frame-support = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
+asset-hub-rococo-runtime = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
-asset-hub-rococo-runtime = { workspace = true, default-features = true }
+parachains-common = { workspace = true, default-features = true }
 rococo-emulated-chain = { workspace = true }
 testnet-parachains-constants = { features = ["rococo"], workspace = true, default-features = true }
 
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/Cargo.toml
index 8e423ebbf9c27d19cdf317542b82eb5ccd53bc30..c67b94d0db73e243c867f3f4754d7b1fb3be422e 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/Cargo.toml
@@ -13,17 +13,17 @@ workspace = true
 [dependencies]
 
 # Substrate
+frame-support = { workspace = true }
 sp-core = { workspace = true }
 sp-keyring = { workspace = true }
-frame-support = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
+asset-hub-westend-runtime = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
-asset-hub-westend-runtime = { workspace = true }
-westend-emulated-chain = { workspace = true, default-features = true }
+parachains-common = { workspace = true, default-features = true }
 testnet-parachains-constants = { features = ["westend"], workspace = true, default-features = true }
+westend-emulated-chain = { workspace = true, default-features = true }
 
 # Polkadot
 xcm = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml
index 231265085edad1f411c842b8ef28debaa4d07842..8b16d8ac27ae3d65d400fc715c5dbb8931cafecf 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-rococo/Cargo.toml
@@ -13,9 +13,9 @@ workspace = true
 [dependencies]
 
 # Substrate
+frame-support = { workspace = true }
 sp-core = { workspace = true }
 sp-keyring = { workspace = true }
-frame-support = { workspace = true }
 
 # Polkadot Dependencies
 xcm = { workspace = true }
@@ -24,8 +24,8 @@ xcm = { workspace = true }
 bp-messages = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
-emulated-integration-tests-common = { workspace = true }
-bridge-hub-rococo-runtime = { workspace = true, default-features = true }
 bridge-hub-common = { workspace = true }
+bridge-hub-rococo-runtime = { workspace = true, default-features = true }
+emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 testnet-parachains-constants = { features = ["rococo"], workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/Cargo.toml
index 8292e132809c446d0cf1c50ece00699a48f58b14..292b5bd3e43420b26bf29704990d3f6f1fbf0a7e 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/bridges/bridge-hub-westend/Cargo.toml
@@ -13,9 +13,9 @@ workspace = true
 [dependencies]
 
 # Substrate
+frame-support = { workspace = true }
 sp-core = { workspace = true }
 sp-keyring = { workspace = true }
-frame-support = { workspace = true }
 
 # Polkadot Dependencies
 xcm = { workspace = true }
@@ -24,8 +24,8 @@ xcm = { workspace = true }
 bp-messages = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
-emulated-integration-tests-common = { workspace = true }
-bridge-hub-westend-runtime = { workspace = true, default-features = true }
 bridge-hub-common = { workspace = true }
+bridge-hub-westend-runtime = { workspace = true, default-features = true }
+emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 testnet-parachains-constants = { features = ["westend"], workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/collectives/collectives-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/collectives/collectives-westend/Cargo.toml
index 87dfd73ab05bab063bedeebae9feb03bcc4af46f..55e3ad6743edd8212f604302cd0a2ed0389aae29 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/collectives/collectives-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/collectives/collectives-westend/Cargo.toml
@@ -13,12 +13,12 @@ workspace = true
 [dependencies]
 
 # Substrate
-sp-core = { workspace = true }
 frame-support = { workspace = true }
+sp-core = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
+collectives-westend-runtime = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
-collectives-westend-runtime = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 testnet-parachains-constants = { features = ["westend"], workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-rococo/Cargo.toml
index 94d43c5eee2f444fdbfd7004a9436217c9291c42..8f12dc675199ce23c282c64802dfd2af2ec472dc 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-rococo/Cargo.toml
@@ -13,12 +13,12 @@ workspace = true
 [dependencies]
 
 # Substrate
-sp-core = { workspace = true }
 frame-support = { workspace = true }
+sp-core = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
-cumulus-primitives-core = { workspace = true }
 coretime-rococo-runtime = { workspace = true, default-features = true }
+cumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 testnet-parachains-constants = { features = ["rococo"], workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-westend/Cargo.toml
index 2640c27d016b36a18d913d2305ef1d1cfb57b91e..fad1000ac66cfe849fd6ed80a51f7f5496b0ca03 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/coretime/coretime-westend/Cargo.toml
@@ -13,12 +13,12 @@ workspace = true
 [dependencies]
 
 # Substrate
-sp-core = { workspace = true }
 frame-support = { workspace = true }
+sp-core = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
-cumulus-primitives-core = { workspace = true }
 coretime-westend-runtime = { workspace = true, default-features = true }
+cumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 testnet-parachains-constants = { features = ["westend"], workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/people/people-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/people/people-rococo/Cargo.toml
index 1549d6a2ab6ba1de05d9233ff7bc29951501a43d..c98e8629e31d52cf568f65df45bbfdefbb98134e 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/people/people-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/people/people-rococo/Cargo.toml
@@ -10,12 +10,12 @@ publish = false
 [dependencies]
 
 # Substrate
-sp-core = { workspace = true }
 frame-support = { workspace = true }
+sp-core = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 people-rococo-runtime = { workspace = true }
 testnet-parachains-constants = { features = ["rococo"], workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/people/people-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/people/people-westend/Cargo.toml
index 9c5ac0bca9de7ae2f201aba958b8220b9a24a013..598ba5488f85498bb36c4e2314769ceced4f89be 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/people/people-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/people/people-westend/Cargo.toml
@@ -10,12 +10,12 @@ publish = false
 [dependencies]
 
 # Substrate
-sp-core = { workspace = true }
 frame-support = { workspace = true }
+sp-core = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 people-westend-runtime = { workspace = true }
 testnet-parachains-constants = { features = ["westend"], workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml
index 743cd7dc54a2800a215e70cc204251975534e1c1..7e92e3bf94481c8b6e50f190d76771c8876643a7 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/Cargo.toml
@@ -13,15 +13,15 @@ workspace = true
 [dependencies]
 
 # Substrate
+frame-support = { workspace = true }
 sp-core = { workspace = true }
 sp-keyring = { workspace = true }
-frame-support = { workspace = true }
 
 # Polkadot
 xcm = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 penpal-runtime = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/Cargo.toml
index 6db1263df8c73821c65882022b7e7afc413eb0d2..ccf3854e67d88e32d4d27c1edc3f77c1ee41465d 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/relays/rococo/Cargo.toml
@@ -13,18 +13,18 @@ workspace = true
 [dependencies]
 
 # Substrate
-sp-core = { workspace = true }
-sp-keyring = { workspace = true }
+sc-consensus-grandpa = { workspace = true }
 sp-authority-discovery = { workspace = true }
 sp-consensus-babe = { workspace = true }
 sp-consensus-beefy = { workspace = true, default-features = true }
-sc-consensus-grandpa = { workspace = true }
+sp-core = { workspace = true }
+sp-keyring = { workspace = true }
 
 # Polkadot
 polkadot-primitives = { workspace = true }
-rococo-runtime-constants = { workspace = true }
 rococo-runtime = { workspace = true }
+rococo-runtime-constants = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/chains/relays/westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/chains/relays/westend/Cargo.toml
index de285d9885a2f78fdea1a27ea8b8d9dc3840d300..9b980d7d39cc2df4bf8154920b981bdcd5547598 100644
--- a/cumulus/parachains/integration-tests/emulated/chains/relays/westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/chains/relays/westend/Cargo.toml
@@ -13,21 +13,21 @@ workspace = true
 [dependencies]
 
 # Substrate
-sp-core = { workspace = true }
-sp-runtime = { workspace = true }
+pallet-staking = { workspace = true }
+sc-consensus-grandpa = { workspace = true }
 sp-authority-discovery = { workspace = true }
 sp-consensus-babe = { workspace = true }
 sp-consensus-beefy = { workspace = true, default-features = true }
-sc-consensus-grandpa = { workspace = true }
-pallet-staking = { workspace = true }
+sp-core = { workspace = true }
+sp-runtime = { workspace = true }
 
 # Polkadot
 polkadot-primitives = { workspace = true }
-westend-runtime-constants = { workspace = true }
 westend-runtime = { workspace = true }
+westend-runtime-constants = { workspace = true }
 xcm = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/common/Cargo.toml b/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
index 8282d12d317f27c5c4aa02a1d9c8bd1eb6fffac7..e921deb9c628e9595d3d3b4625341f7f14d7adee 100644
--- a/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
@@ -16,36 +16,36 @@ codec = { workspace = true }
 paste = { workspace = true, default-features = true }
 
 # Substrate
-sp-consensus-beefy = { workspace = true, default-features = true }
-sc-consensus-grandpa = { workspace = true, default-features = true }
-sp-authority-discovery = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 frame-support = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
 pallet-assets = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
 pallet-message-queue = { workspace = true, default-features = true }
+sc-consensus-grandpa = { workspace = true, default-features = true }
+sp-authority-discovery = { workspace = true, default-features = true }
+sp-consensus-babe = { workspace = true, default-features = true }
+sp-consensus-beefy = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 
 # Polkadot
-polkadot-primitives = { workspace = true, default-features = true }
+pallet-xcm = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 polkadot-runtime-parachains = { workspace = true, default-features = true }
 xcm = { workspace = true, default-features = true }
-pallet-xcm = { workspace = true, default-features = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
+asset-test-utils = { workspace = true, default-features = true }
+cumulus-pallet-parachain-system = { workspace = true, default-features = true }
+cumulus-pallet-xcmp-queue = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
+parachains-common = { workspace = true, default-features = true }
 xcm-emulator = { workspace = true, default-features = true }
-cumulus-pallet-xcmp-queue = { workspace = true, default-features = true }
-cumulus-pallet-parachain-system = { workspace = true, default-features = true }
-asset-test-utils = { workspace = true, default-features = true }
 
 # Bridges
 bp-messages = { workspace = true, default-features = true }
 bp-xcm-bridge-hub = { workspace = true, default-features = true }
+bridge-runtime-common = { workspace = true, default-features = true }
 pallet-bridge-messages = { workspace = true, default-features = true }
 pallet-xcm-bridge-hub = { workspace = true, default-features = true }
-bridge-runtime-common = { workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/networks/rococo-system/Cargo.toml b/cumulus/parachains/integration-tests/emulated/networks/rococo-system/Cargo.toml
index 864f3c6edd7e3f91566666c65c509d2494009d4d..2f8889e4816263beb8dcbb60173aced583fb338d 100644
--- a/cumulus/parachains/integration-tests/emulated/networks/rococo-system/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/networks/rococo-system/Cargo.toml
@@ -12,10 +12,10 @@ workspace = true
 
 [dependencies]
 # Cumulus
-emulated-integration-tests-common = { workspace = true }
-rococo-emulated-chain = { workspace = true }
 asset-hub-rococo-emulated-chain = { workspace = true }
 bridge-hub-rococo-emulated-chain = { workspace = true }
-people-rococo-emulated-chain = { workspace = true }
-penpal-emulated-chain = { workspace = true }
 coretime-rococo-emulated-chain = { workspace = true }
+emulated-integration-tests-common = { workspace = true }
+penpal-emulated-chain = { workspace = true }
+people-rococo-emulated-chain = { workspace = true }
+rococo-emulated-chain = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/Cargo.toml b/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/Cargo.toml
index cd0cb272b7f5ea9bea09835b7cf4612ad9c377be..1b789b21c7dfdfe409aad71e288e915259748f8e 100644
--- a/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/networks/rococo-westend-system/Cargo.toml
@@ -12,11 +12,11 @@ workspace = true
 
 [dependencies]
 # Cumulus
-emulated-integration-tests-common = { workspace = true }
-rococo-emulated-chain = { workspace = true }
-westend-emulated-chain = { workspace = true, default-features = true }
 asset-hub-rococo-emulated-chain = { workspace = true }
 asset-hub-westend-emulated-chain = { workspace = true }
 bridge-hub-rococo-emulated-chain = { workspace = true }
 bridge-hub-westend-emulated-chain = { workspace = true }
+emulated-integration-tests-common = { workspace = true }
 penpal-emulated-chain = { workspace = true }
+rococo-emulated-chain = { workspace = true }
+westend-emulated-chain = { workspace = true, default-features = true }
diff --git a/cumulus/parachains/integration-tests/emulated/networks/westend-system/Cargo.toml b/cumulus/parachains/integration-tests/emulated/networks/westend-system/Cargo.toml
index cec2e3733b2a0fbe83608f75981e5c288c70ea7f..50e75a6bdd746d45119af7f75e36ee7da28a8343 100644
--- a/cumulus/parachains/integration-tests/emulated/networks/westend-system/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/networks/westend-system/Cargo.toml
@@ -12,11 +12,11 @@ workspace = true
 
 [dependencies]
 # Cumulus
-emulated-integration-tests-common = { workspace = true }
-westend-emulated-chain = { workspace = true }
 asset-hub-westend-emulated-chain = { workspace = true }
 bridge-hub-westend-emulated-chain = { workspace = true }
 collectives-westend-emulated-chain = { workspace = true }
+coretime-westend-emulated-chain = { workspace = true }
+emulated-integration-tests-common = { workspace = true }
 penpal-emulated-chain = { workspace = true }
 people-westend-emulated-chain = { workspace = true }
-coretime-westend-emulated-chain = { workspace = true }
+westend-emulated-chain = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/Cargo.toml
index 3d40db6b03ab5e172a9885bde1325bf614c34b19..9e8b8f2a52d7819e3af0422f9a4f9f534a407a1d 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/Cargo.toml
@@ -11,31 +11,31 @@ publish = false
 workspace = true
 
 [dependencies]
-codec = { workspace = true }
 assert_matches = { workspace = true }
+codec = { workspace = true }
 
 # Substrate
-sp-runtime = { workspace = true }
-sp-core = { workspace = true }
 frame-support = { workspace = true }
-pallet-balances = { workspace = true }
-pallet-assets = { workspace = true }
 pallet-asset-conversion = { workspace = true }
+pallet-assets = { workspace = true }
+pallet-balances = { workspace = true }
 pallet-message-queue = { workspace = true }
 pallet-treasury = { workspace = true }
 pallet-utility = { workspace = true }
+sp-core = { workspace = true }
+sp-runtime = { workspace = true }
 
 # Polkadot
-xcm = { workspace = true }
 pallet-xcm = { workspace = true }
-xcm-executor = { workspace = true }
-xcm-runtime-apis = { workspace = true, default-features = true }
 polkadot-runtime-common = { workspace = true, default-features = true }
 rococo-runtime-constants = { workspace = true, default-features = true }
+xcm = { workspace = true }
+xcm-executor = { workspace = true }
+xcm-runtime-apis = { workspace = true, default-features = true }
 
 # Cumulus
 asset-test-utils = { workspace = true, default-features = true }
 cumulus-pallet-parachain-system = { workspace = true }
-parachains-common = { workspace = true, default-features = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 rococo-system-emulated-network = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/Cargo.toml
index 7117124b1d1f9a9c1f8fb279897501720589658f..5cd00c239e60d24df018bccb5937fe4ed4277659 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/Cargo.toml
@@ -11,36 +11,36 @@ publish = false
 workspace = true
 
 [dependencies]
-codec = { workspace = true }
 assert_matches = { workspace = true }
+codec = { workspace = true }
 
 # Substrate
-sp-runtime = { workspace = true }
-sp-core = { workspace = true }
 frame-metadata-hash-extension = { workspace = true, default-features = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-pallet-balances = { workspace = true }
-pallet-assets = { workspace = true }
 pallet-asset-conversion = { workspace = true }
-pallet-treasury = { workspace = true }
+pallet-asset-tx-payment = { workspace = true }
+pallet-assets = { workspace = true }
+pallet-balances = { workspace = true }
 pallet-message-queue = { workspace = true }
 pallet-transaction-payment = { workspace = true }
-pallet-asset-tx-payment = { workspace = true }
+pallet-treasury = { workspace = true }
+sp-core = { workspace = true }
+sp-runtime = { workspace = true }
 
 # Polkadot
+pallet-xcm = { workspace = true }
 polkadot-runtime-common = { workspace = true, default-features = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
-pallet-xcm = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # Cumulus
-assets-common = { workspace = true }
-parachains-common = { workspace = true, default-features = true }
 asset-test-utils = { workspace = true, default-features = true }
-cumulus-pallet-xcmp-queue = { workspace = true }
+assets-common = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
+cumulus-pallet-xcmp-queue = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 westend-system-emulated-network = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml
index 9f6fe78a33eebfccbe387df6a86336cb0ed1737b..7bb7277df45c0055ae59c5c586c7a3bbb7e08661 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml
@@ -12,21 +12,21 @@ workspace = true
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 hex-literal = { workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true }
 
 # Substrate
-sp-core = { workspace = true }
 frame-support = { workspace = true }
-pallet-assets = { workspace = true }
 pallet-asset-conversion = { workspace = true }
+pallet-assets = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-message-queue = { workspace = true, default-features = true }
+sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 
 # Polkadot
-xcm = { workspace = true }
 pallet-xcm = { workspace = true }
+xcm = { workspace = true }
 xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
@@ -44,7 +44,7 @@ testnet-parachains-constants = { features = ["rococo", "westend"], workspace = t
 
 # Snowbridge
 snowbridge-core = { workspace = true }
-snowbridge-router-primitives = { workspace = true }
-snowbridge-pallet-system = { workspace = true }
-snowbridge-pallet-outbound-queue = { workspace = true }
 snowbridge-pallet-inbound-queue-fixtures = { workspace = true, default-features = true }
+snowbridge-pallet-outbound-queue = { workspace = true }
+snowbridge-pallet-system = { workspace = true }
+snowbridge-router-primitives = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/Cargo.toml
index b87f25ac0f014125bc5807fa8732dfb8ee67067a..dc3bbb269d70efe654a63a18ec1a92342486d6bd 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/Cargo.toml
@@ -11,23 +11,23 @@ publish = false
 workspace = true
 
 [dependencies]
-hex-literal = { workspace = true, default-features = true }
 codec = { workspace = true }
+hex-literal = { workspace = true, default-features = true }
 log = { workspace = true }
 scale-info = { workspace = true }
 
 # Substrate
 frame-support = { workspace = true }
-pallet-assets = { workspace = true }
 pallet-asset-conversion = { workspace = true }
+pallet-assets = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-message-queue = { workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 
 # Polkadot
-xcm = { workspace = true }
 pallet-xcm = { workspace = true }
+xcm = { workspace = true }
 xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
@@ -36,18 +36,18 @@ pallet-bridge-messages = { workspace = true }
 pallet-xcm-bridge-hub = { workspace = true }
 
 # Cumulus
+asset-hub-westend-runtime = { workspace = true }
+bridge-hub-westend-runtime = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
 parachains-common = { workspace = true, default-features = true }
 rococo-westend-system-emulated-network = { workspace = true }
 testnet-parachains-constants = { features = ["rococo", "westend"], workspace = true, default-features = true }
-asset-hub-westend-runtime = { workspace = true }
-bridge-hub-westend-runtime = { workspace = true }
 
 # Snowbridge
 snowbridge-core = { workspace = true }
-snowbridge-router-primitives = { workspace = true }
-snowbridge-pallet-system = { workspace = true }
-snowbridge-pallet-outbound-queue = { workspace = true }
 snowbridge-pallet-inbound-queue = { workspace = true }
 snowbridge-pallet-inbound-queue-fixtures = { workspace = true }
+snowbridge-pallet-outbound-queue = { workspace = true }
+snowbridge-pallet-system = { workspace = true }
+snowbridge-router-primitives = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/tests/collectives/collectives-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/collectives/collectives-westend/Cargo.toml
index c4d281b75a77b32a9772ade66e2dbb0837cc8fcf..1d4e93d40da454a30f12c9f645010b2121560b9e 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/collectives/collectives-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/collectives/collectives-westend/Cargo.toml
@@ -11,31 +11,31 @@ publish = false
 workspace = true
 
 [dependencies]
-codec = { workspace = true }
 assert_matches = { workspace = true }
+codec = { workspace = true }
 
 # Substrate
-sp-runtime = { workspace = true }
 frame-support = { workspace = true }
-pallet-balances = { workspace = true }
 pallet-asset-rate = { workspace = true }
 pallet-assets = { workspace = true }
-pallet-treasury = { workspace = true }
+pallet-balances = { workspace = true }
 pallet-message-queue = { workspace = true }
+pallet-treasury = { workspace = true }
 pallet-utility = { workspace = true }
 pallet-whitelist = { workspace = true }
+sp-runtime = { workspace = true }
 
 # Polkadot
+pallet-xcm = { workspace = true }
 polkadot-runtime-common = { workspace = true, default-features = true }
+westend-runtime-constants = { workspace = true, default-features = true }
 xcm = { workspace = true }
 xcm-executor = { workspace = true }
-pallet-xcm = { workspace = true }
-westend-runtime-constants = { workspace = true, default-features = true }
 
 # Cumulus
-parachains-common = { workspace = true, default-features = true }
-testnet-parachains-constants = { features = ["westend"], workspace = true, default-features = true }
-cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
+cumulus-pallet-xcmp-queue = { workspace = true }
 emulated-integration-tests-common = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
+testnet-parachains-constants = { features = ["westend"], workspace = true, default-features = true }
 westend-system-emulated-network = { workspace = true }
diff --git a/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-rococo/Cargo.toml
index 28d9da0993ff6cfbb3c535fc998eb634e90ed00d..61397b1b8d40786e32b36eb9fabda962db19a2c8 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-rococo/Cargo.toml
@@ -13,8 +13,8 @@ publish = false
 frame-support = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-broker = { workspace = true, default-features = true }
-pallet-message-queue = { workspace = true }
 pallet-identity = { workspace = true }
+pallet-message-queue = { workspace = true }
 sp-runtime = { workspace = true }
 
 # Polkadot
diff --git a/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-westend/Cargo.toml
index d57e7926b0ec1fa6f73ed40260d8eb5976be0cd3..9f0eadf136501b7a76020f81b47f37205ace63e7 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-westend/Cargo.toml
@@ -13,8 +13,8 @@ publish = false
 frame-support = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-broker = { workspace = true, default-features = true }
-pallet-message-queue = { workspace = true }
 pallet-identity = { workspace = true }
+pallet-message-queue = { workspace = true }
 sp-runtime = { workspace = true }
 
 # Polkadot
diff --git a/cumulus/parachains/integration-tests/emulated/tests/people/people-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/people/people-rococo/Cargo.toml
index 011be93ecac73f06a73616802d19a0e871cd8b30..8b12897ef018b9016835857aa5bc75e2306f9133 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/people/people-rococo/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/people/people-rococo/Cargo.toml
@@ -13,8 +13,8 @@ codec = { workspace = true }
 # Substrate
 frame-support = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-message-queue = { workspace = true }
 pallet-identity = { workspace = true }
+pallet-message-queue = { workspace = true }
 sp-runtime = { workspace = true }
 
 # Polkadot
diff --git a/cumulus/parachains/integration-tests/emulated/tests/people/people-westend/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/people/people-westend/Cargo.toml
index 53acd038cdf515c335808d1f3ca161b9cfdcd2e9..e069c1f617836040f151b7ffede7df519e734998 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/people/people-westend/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/tests/people/people-westend/Cargo.toml
@@ -13,15 +13,15 @@ codec = { workspace = true }
 # Substrate
 frame-support = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-message-queue = { workspace = true }
 pallet-identity = { workspace = true }
+pallet-message-queue = { workspace = true }
 pallet-xcm = { workspace = true }
 sp-runtime = { workspace = true }
 
 # Polkadot
 polkadot-runtime-common = { workspace = true, default-features = true }
-westend-runtime-constants = { workspace = true, default-features = true }
 westend-runtime = { workspace = true }
+westend-runtime-constants = { workspace = true, default-features = true }
 xcm = { workspace = true }
 xcm-executor = { workspace = true }
 
diff --git a/cumulus/parachains/pallets/ping/Cargo.toml b/cumulus/parachains/pallets/ping/Cargo.toml
index ceb38f39fd80fd771f058cb7e1cf3425609d989b..248b5d7202fa44ab5fd26748fc2444aa95e006ae 100644
--- a/cumulus/parachains/pallets/ping/Cargo.toml
+++ b/cumulus/parachains/pallets/ping/Cargo.toml
@@ -15,14 +15,14 @@ workspace = true
 codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
-sp-runtime = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+sp-runtime = { workspace = true }
 
 xcm = { workspace = true }
 
-cumulus-primitives-core = { workspace = true }
 cumulus-pallet-xcm = { workspace = true }
+cumulus-primitives-core = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml
index 81ebc7e09494018f220d5076ed3a493db3f0a211..c954ddb7b8c7a9ad523ec5700f7b6d36f7d261b7 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/Cargo.toml
@@ -27,10 +27,10 @@ frame-system = { workspace = true }
 frame-system-benchmarking = { optional = true, workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
+pallet-asset-conversion = { workspace = true }
+pallet-asset-conversion-ops = { workspace = true }
 pallet-asset-conversion-tx-payment = { workspace = true }
 pallet-assets = { workspace = true }
-pallet-asset-conversion-ops = { workspace = true }
-pallet-asset-conversion = { workspace = true }
 pallet-assets-freezer = { workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
@@ -51,9 +51,9 @@ sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
-sp-keyring = { workspace = true }
-sp-inherents = { workspace = true }
 sp-genesis-builder = { workspace = true }
+sp-inherents = { workspace = true }
+sp-keyring = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
@@ -65,17 +65,18 @@ sp-weights = { workspace = true }
 primitive-types = { features = ["codec", "num-traits", "scale-info"], workspace = true }
 
 # Polkadot
-rococo-runtime-constants = { workspace = true }
 pallet-xcm = { workspace = true }
 pallet-xcm-benchmarks = { optional = true, workspace = true }
 polkadot-parachain-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
+rococo-runtime-constants = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # Cumulus
+assets-common = { workspace = true }
 cumulus-pallet-aura-ext = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-session-benchmarking = { workspace = true }
@@ -83,20 +84,19 @@ cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { features = ["bridging"], workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
 pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
 parachains-common = { workspace = true }
 testnet-parachains-constants = { features = ["rococo"], workspace = true }
-assets-common = { workspace = true }
 
 # Bridges
-pallet-xcm-bridge-hub-router = { workspace = true }
 bp-asset-hub-rococo = { workspace = true }
 bp-asset-hub-westend = { workspace = true }
 bp-bridge-hub-rococo = { workspace = true }
 bp-bridge-hub-westend = { workspace = true }
+pallet-xcm-bridge-hub-router = { workspace = true }
 snowbridge-router-primitives = { workspace = true }
 
 [dev-dependencies]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
index 7dd2a4ab4b51fab380cd76a5966a80d782832915..7c31745d8f6e1c10c7d9a0ad3c3be022ed4884db 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
@@ -27,10 +27,10 @@ frame-system = { workspace = true }
 frame-system-benchmarking = { optional = true, workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
+pallet-asset-conversion = { workspace = true }
 pallet-asset-conversion-ops = { workspace = true }
 pallet-asset-conversion-tx-payment = { workspace = true }
 pallet-assets = { workspace = true }
-pallet-asset-conversion = { workspace = true }
 pallet-assets-freezer = { workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
@@ -40,21 +40,21 @@ pallet-nft-fractionalization = { workspace = true }
 pallet-nfts = { workspace = true }
 pallet-nfts-runtime-api = { workspace = true }
 pallet-proxy = { workspace = true }
+pallet-revive = { workspace = true }
 pallet-session = { workspace = true }
 pallet-state-trie-migration = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-uniques = { workspace = true }
-pallet-revive = { workspace = true }
 pallet-utility = { workspace = true }
 sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
-sp-keyring = { workspace = true }
 sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
+sp-keyring = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
@@ -77,28 +77,28 @@ xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # Cumulus
+assets-common = { workspace = true }
 cumulus-pallet-aura-ext = { workspace = true }
-pallet-message-queue = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-session-benchmarking = { workspace = true }
 cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { features = ["bridging"], workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
 pallet-collator-selection = { workspace = true }
+pallet-message-queue = { workspace = true }
 parachain-info = { workspace = true }
 parachains-common = { workspace = true }
 testnet-parachains-constants = { features = ["westend"], workspace = true }
-assets-common = { workspace = true }
 
 # Bridges
-pallet-xcm-bridge-hub-router = { workspace = true }
 bp-asset-hub-rococo = { workspace = true }
 bp-asset-hub-westend = { workspace = true }
 bp-bridge-hub-rococo = { workspace = true }
 bp-bridge-hub-westend = { workspace = true }
+pallet-xcm-bridge-hub-router = { workspace = true }
 snowbridge-router-primitives = { workspace = true }
 
 [dev-dependencies]
diff --git a/cumulus/parachains/runtimes/assets/common/Cargo.toml b/cumulus/parachains/runtimes/assets/common/Cargo.toml
index 552afa4daa68636cb5a3740d83b9c4bcc114ef08..de74f59f43c054d0744daa989157a17a8172dbcf 100644
--- a/cumulus/parachains/runtimes/assets/common/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/common/Cargo.toml
@@ -13,16 +13,16 @@ workspace = true
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-log = { workspace = true }
 impl-trait-for-tuples = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 
 # Substrate
 frame-support = { workspace = true }
+pallet-asset-conversion = { workspace = true }
+pallet-assets = { workspace = true }
 sp-api = { workspace = true }
 sp-runtime = { workspace = true }
-pallet-assets = { workspace = true }
-pallet-asset-conversion = { workspace = true }
 
 # Polkadot
 pallet-xcm = { workspace = true }
@@ -31,8 +31,8 @@ xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
 
 # Cumulus
-parachains-common = { workspace = true }
 cumulus-primitives-core = { workspace = true }
+parachains-common = { workspace = true }
 
 [build-dependencies]
 substrate-wasm-builder = { workspace = true, default-features = true }
diff --git a/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml b/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml
index 393d06f95b15e1ca3098432ff8b3f7e1b083156a..cad8d10a7da3dbf7c882ad382667301b583569a2 100644
--- a/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/test-utils/Cargo.toml
@@ -17,28 +17,28 @@ codec = { features = ["derive", "max-encoded-len"], workspace = true }
 # Substrate
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-pallet-assets = { workspace = true }
 pallet-asset-conversion = { workspace = true }
+pallet-assets = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-timestamp = { workspace = true }
 pallet-session = { workspace = true }
+pallet-timestamp = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
 # Cumulus
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
-pallet-collator-selection = { workspace = true }
-parachains-common = { workspace = true }
 cumulus-primitives-core = { workspace = true }
+pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
+parachains-common = { workspace = true }
 parachains-runtimes-test-utils = { workspace = true }
 
 # Polkadot
+pallet-xcm = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
-pallet-xcm = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # Bridges
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
index ff50223ef575b8c4220c14cd4a8a7b704bcb737e..3fabea3b02f4f6f7904192055a82202b0416bc84 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
@@ -34,9 +34,9 @@ frame-try-runtime = { optional = true, workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-session = { workspace = true }
 pallet-message-queue = { workspace = true }
 pallet-multisig = { workspace = true }
+pallet-session = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
@@ -45,10 +45,10 @@ sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
-sp-keyring = { workspace = true }
 sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
 sp-io = { workspace = true }
+sp-keyring = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
@@ -58,11 +58,11 @@ sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
 
 # Polkadot
-rococo-runtime-constants = { workspace = true }
 pallet-xcm = { workspace = true }
 pallet-xcm-benchmarks = { optional = true, workspace = true }
 polkadot-parachain-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
+rococo-runtime-constants = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
@@ -95,28 +95,28 @@ bp-parachains = { workspace = true }
 bp-polkadot-bulletin = { workspace = true }
 bp-polkadot-core = { workspace = true }
 bp-relayers = { workspace = true }
-bp-runtime = { workspace = true }
 bp-rococo = { workspace = true }
+bp-runtime = { workspace = true }
 bp-westend = { workspace = true }
 bp-xcm-bridge-hub-router = { workspace = true }
+bridge-runtime-common = { workspace = true }
 pallet-bridge-grandpa = { workspace = true }
 pallet-bridge-messages = { workspace = true }
 pallet-bridge-parachains = { workspace = true }
 pallet-bridge-relayers = { workspace = true }
 pallet-xcm-bridge-hub = { workspace = true }
-bridge-runtime-common = { workspace = true }
 
 # Ethereum Bridge (Snowbridge)
 snowbridge-beacon-primitives = { workspace = true }
-snowbridge-pallet-system = { workspace = true }
-snowbridge-system-runtime-api = { workspace = true }
 snowbridge-core = { workspace = true }
+snowbridge-outbound-queue-runtime-api = { workspace = true }
 snowbridge-pallet-ethereum-client = { workspace = true }
 snowbridge-pallet-inbound-queue = { workspace = true }
 snowbridge-pallet-outbound-queue = { workspace = true }
-snowbridge-outbound-queue-runtime-api = { workspace = true }
+snowbridge-pallet-system = { workspace = true }
 snowbridge-router-primitives = { workspace = true }
 snowbridge-runtime-common = { workspace = true }
+snowbridge-system-runtime-api = { workspace = true }
 
 bridge-hub-common = { workspace = true }
 
@@ -124,8 +124,8 @@ bridge-hub-common = { workspace = true }
 bridge-hub-test-utils = { workspace = true, default-features = true }
 bridge-runtime-common = { features = ["integrity-test"], workspace = true, default-features = true }
 pallet-bridge-relayers = { features = ["integrity-test"], workspace = true }
-snowbridge-runtime-test-common = { workspace = true, default-features = true }
 parachains-runtimes-test-utils = { workspace = true, default-features = true }
+snowbridge-runtime-test-common = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml
index efdd0abbb8ee4f4ef8c19f4a67987d5309cee4f4..644aa72d131162510a2fb34d4ad1ed195eafef5e 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/Cargo.toml
@@ -34,9 +34,9 @@ frame-try-runtime = { optional = true, workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-session = { workspace = true }
 pallet-message-queue = { workspace = true }
 pallet-multisig = { workspace = true }
+pallet-session = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
@@ -45,10 +45,10 @@ sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
-sp-keyring = { workspace = true }
 sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
 sp-io = { workspace = true }
+sp-keyring = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
@@ -58,11 +58,11 @@ sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
 
 # Polkadot
-westend-runtime-constants = { workspace = true }
 pallet-xcm = { workspace = true }
 pallet-xcm-benchmarks = { optional = true, workspace = true }
 polkadot-parachain-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
+westend-runtime-constants = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
@@ -76,8 +76,8 @@ cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { features = ["bridging"], workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
 
 pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
@@ -94,37 +94,37 @@ bp-messages = { workspace = true }
 bp-parachains = { workspace = true }
 bp-polkadot-core = { workspace = true }
 bp-relayers = { workspace = true }
-bp-runtime = { workspace = true }
 bp-rococo = { workspace = true }
+bp-runtime = { workspace = true }
 bp-westend = { workspace = true }
 bp-xcm-bridge-hub-router = { workspace = true }
+bridge-hub-common = { workspace = true }
+bridge-runtime-common = { workspace = true }
 pallet-bridge-grandpa = { workspace = true }
 pallet-bridge-messages = { workspace = true }
 pallet-bridge-parachains = { workspace = true }
 pallet-bridge-relayers = { workspace = true }
 pallet-xcm-bridge-hub = { workspace = true }
-bridge-runtime-common = { workspace = true }
-bridge-hub-common = { workspace = true }
 
 # Ethereum Bridge (Snowbridge)
 snowbridge-beacon-primitives = { workspace = true }
-snowbridge-pallet-system = { workspace = true }
-snowbridge-system-runtime-api = { workspace = true }
 snowbridge-core = { workspace = true }
+snowbridge-outbound-queue-runtime-api = { workspace = true }
 snowbridge-pallet-ethereum-client = { workspace = true }
 snowbridge-pallet-inbound-queue = { workspace = true }
 snowbridge-pallet-outbound-queue = { workspace = true }
-snowbridge-outbound-queue-runtime-api = { workspace = true }
+snowbridge-pallet-system = { workspace = true }
 snowbridge-router-primitives = { workspace = true }
 snowbridge-runtime-common = { workspace = true }
+snowbridge-system-runtime-api = { workspace = true }
 
 
 [dev-dependencies]
 bridge-hub-test-utils = { workspace = true, default-features = true }
 bridge-runtime-common = { features = ["integrity-test"], workspace = true, default-features = true }
 pallet-bridge-relayers = { features = ["integrity-test"], workspace = true }
-snowbridge-runtime-test-common = { workspace = true, default-features = true }
 parachains-runtimes-test-utils = { workspace = true, default-features = true }
+snowbridge-runtime-test-common = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/parachains/runtimes/bridge-hubs/common/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/common/Cargo.toml
index 9eacb27639a3ba6b3734894eb830fbe0d44bd4d3..2fbb96d75163583f6be49b54a6b9238194987cfa 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/common/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/common/Cargo.toml
@@ -10,15 +10,15 @@ repository.workspace = true
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
+cumulus-primitives-core = { workspace = true }
 frame-support = { workspace = true }
+pallet-message-queue = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+snowbridge-core = { workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
-cumulus-primitives-core = { workspace = true }
 xcm = { workspace = true }
-pallet-message-queue = { workspace = true }
-snowbridge-core = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml
index 16fef951f328cc2fa12e75221921476aa218cbf2..ace23e71c4d119e7870eb86794bd4316e0a275c4 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/test-utils/Cargo.toml
@@ -19,14 +19,14 @@ log = { workspace = true }
 # Substrate
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+pallet-balances = { workspace = true }
+pallet-timestamp = { workspace = true }
+pallet-utility = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-keyring = { workspace = true, default-features = true }
 sp-runtime = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
-pallet-balances = { workspace = true }
-pallet-utility = { workspace = true }
-pallet-timestamp = { workspace = true }
 
 # Cumulus
 asset-test-utils = { workspace = true, default-features = true }
@@ -36,10 +36,10 @@ parachains-common = { workspace = true }
 parachains-runtimes-test-utils = { workspace = true }
 
 # Polkadot
+pallet-xcm = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
-pallet-xcm = { workspace = true }
 
 # Bridges
 bp-header-chain = { workspace = true }
@@ -50,12 +50,12 @@ bp-relayers = { workspace = true }
 bp-runtime = { workspace = true }
 bp-test-utils = { workspace = true }
 bp-xcm-bridge-hub = { workspace = true }
+bridge-runtime-common = { workspace = true }
 pallet-bridge-grandpa = { workspace = true }
-pallet-bridge-parachains = { workspace = true }
 pallet-bridge-messages = { features = ["test-helpers"], workspace = true }
+pallet-bridge-parachains = { workspace = true }
 pallet-bridge-relayers = { workspace = true }
 pallet-xcm-bridge-hub = { workspace = true }
-bridge-runtime-common = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/parachains/runtimes/collectives/collectives-westend/Cargo.toml b/cumulus/parachains/runtimes/collectives/collectives-westend/Cargo.toml
index 2e35fe761c0438d8c42dae77806cddff9ae0e8bb..9c70b65060dd93a2dee8d8f8fa2f849ef1ef330c 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-westend/Cargo.toml
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/Cargo.toml
@@ -26,15 +26,19 @@ frame-system = { workspace = true }
 frame-system-benchmarking = { optional = true, workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
-pallet-asset-rate = { workspace = true }
 pallet-alliance = { workspace = true }
+pallet-asset-rate = { workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-collective = { workspace = true }
+pallet-core-fellowship = { workspace = true }
 pallet-multisig = { workspace = true }
 pallet-preimage = { workspace = true }
 pallet-proxy = { workspace = true }
+pallet-ranked-collective = { workspace = true }
+pallet-referenda = { workspace = true }
+pallet-salary = { workspace = true }
 pallet-scheduler = { workspace = true }
 pallet-session = { workspace = true }
 pallet-state-trie-migration = { workspace = true }
@@ -43,18 +47,14 @@ pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-treasury = { workspace = true }
 pallet-utility = { workspace = true }
-pallet-referenda = { workspace = true }
-pallet-ranked-collective = { workspace = true }
-pallet-core-fellowship = { workspace = true }
-pallet-salary = { workspace = true }
 sp-api = { workspace = true }
 sp-arithmetic = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
-sp-keyring = { workspace = true }
 sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
+sp-keyring = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
@@ -67,23 +67,23 @@ sp-version = { workspace = true }
 pallet-xcm = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
+westend-runtime-constants = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
-westend-runtime-constants = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # Cumulus
 cumulus-pallet-aura-ext = { workspace = true }
-pallet-message-queue = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-session-benchmarking = { workspace = true }
 cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
+pallet-message-queue = { workspace = true }
 
 pallet-collator-selection = { workspace = true }
 pallet-collective-content = { workspace = true }
@@ -95,8 +95,8 @@ testnet-parachains-constants = { features = ["westend"], workspace = true }
 substrate-wasm-builder = { optional = true, workspace = true, default-features = true }
 
 [dev-dependencies]
-sp-io = { features = ["std"], workspace = true, default-features = true }
 parachains-runtimes-test-utils = { workspace = true, default-features = true }
+sp-io = { features = ["std"], workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml b/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
index 260c748819ae35710810a4133dd72aa40d0a9f14..cb0655d70cf29e4679b5ade41794e0c5089f8568 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/Cargo.toml
@@ -24,37 +24,37 @@ log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
 # Substrate
-sp-api = { workspace = true }
-sp-block-builder = { workspace = true }
-sp-consensus-aura = { workspace = true }
-sp-core = { workspace = true }
-sp-genesis-builder = { workspace = true }
-sp-inherents = { workspace = true }
-sp-offchain = { workspace = true }
-sp-runtime = { workspace = true }
-sp-session = { workspace = true }
-sp-storage = { workspace = true }
-sp-transaction-pool = { workspace = true }
-sp-version = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
-frame-try-runtime = { optional = true, workspace = true }
 frame-executive = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-system-benchmarking = { optional = true, workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
+frame-try-runtime = { optional = true, workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
-pallet-insecure-randomness-collective-flip = { workspace = true }
 pallet-balances = { workspace = true }
+pallet-contracts = { workspace = true }
+pallet-insecure-randomness-collective-flip = { workspace = true }
 pallet-multisig = { workspace = true }
 pallet-session = { workspace = true }
+pallet-sudo = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-utility = { workspace = true }
-pallet-sudo = { workspace = true }
-pallet-contracts = { workspace = true }
+sp-api = { workspace = true }
+sp-block-builder = { workspace = true }
+sp-consensus-aura = { workspace = true }
+sp-core = { workspace = true }
+sp-genesis-builder = { workspace = true }
+sp-inherents = { workspace = true }
+sp-offchain = { workspace = true }
+sp-runtime = { workspace = true }
+sp-session = { workspace = true }
+sp-storage = { workspace = true }
+sp-transaction-pool = { workspace = true }
+sp-version = { workspace = true }
 
 # Polkadot
 pallet-xcm = { workspace = true }
@@ -68,15 +68,15 @@ xcm-runtime-apis = { workspace = true }
 
 # Cumulus
 cumulus-pallet-aura-ext = { workspace = true }
-pallet-message-queue = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-session-benchmarking = { workspace = true }
 cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
+pallet-message-queue = { workspace = true }
 
 pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
diff --git a/cumulus/parachains/runtimes/coretime/coretime-rococo/Cargo.toml b/cumulus/parachains/runtimes/coretime/coretime-rococo/Cargo.toml
index aa692c3c7e744da96f4e5c1a4262aadf94d16162..2b5fab329293d58f445ba2e30bbacfa5b8305dff 100644
--- a/cumulus/parachains/runtimes/coretime/coretime-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/coretime/coretime-rococo/Cargo.toml
@@ -33,8 +33,8 @@ frame-try-runtime = { optional = true, workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-message-queue = { workspace = true }
 pallet-broker = { workspace = true }
+pallet-message-queue = { workspace = true }
 pallet-multisig = { workspace = true }
 pallet-proxy = { workspace = true }
 pallet-session = { workspace = true }
@@ -47,8 +47,8 @@ sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
-sp-inherents = { workspace = true }
 sp-genesis-builder = { workspace = true }
+sp-inherents = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
@@ -75,8 +75,8 @@ cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
 pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
 parachains-common = { workspace = true }
diff --git a/cumulus/parachains/runtimes/coretime/coretime-westend/Cargo.toml b/cumulus/parachains/runtimes/coretime/coretime-westend/Cargo.toml
index 226e1c817bb8ef7058fb502b2bd35332966ee2f8..03df782bc266afe39bcd1a430debb531a5adff3e 100644
--- a/cumulus/parachains/runtimes/coretime/coretime-westend/Cargo.toml
+++ b/cumulus/parachains/runtimes/coretime/coretime-westend/Cargo.toml
@@ -33,8 +33,8 @@ frame-try-runtime = { optional = true, workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-message-queue = { workspace = true }
 pallet-broker = { workspace = true }
+pallet-message-queue = { workspace = true }
 pallet-multisig = { workspace = true }
 pallet-proxy = { workspace = true }
 pallet-session = { workspace = true }
@@ -46,8 +46,8 @@ sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
-sp-inherents = { workspace = true }
 sp-genesis-builder = { workspace = true }
+sp-inherents = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
@@ -74,8 +74,8 @@ cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
 
 pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
diff --git a/cumulus/parachains/runtimes/glutton/glutton-westend/Cargo.toml b/cumulus/parachains/runtimes/glutton/glutton-westend/Cargo.toml
index f2922b710e246f3151637529ed142e72b724bfa2..1c1041a4317ef29d42c23e80bcde988d6ae1f69a 100644
--- a/cumulus/parachains/runtimes/glutton/glutton-westend/Cargo.toml
+++ b/cumulus/parachains/runtimes/glutton/glutton-westend/Cargo.toml
@@ -20,11 +20,12 @@ frame-benchmarking = { optional = true, workspace = true }
 frame-executive = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-frame-system-rpc-runtime-api = { workspace = true }
 frame-system-benchmarking = { optional = true, workspace = true }
+frame-system-rpc-runtime-api = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
 pallet-aura = { workspace = true }
 pallet-glutton = { workspace = true }
+pallet-message-queue = { workspace = true }
 pallet-sudo = { workspace = true }
 pallet-timestamp = { workspace = true }
 sp-api = { workspace = true }
@@ -33,7 +34,6 @@ sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
 sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
-pallet-message-queue = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
diff --git a/cumulus/parachains/runtimes/people/people-rococo/Cargo.toml b/cumulus/parachains/runtimes/people/people-rococo/Cargo.toml
index 4984f6314f872d84dcb712aca278dbba0937ad78..de2898046c0d75b4ce0613c58e675747795c2302 100644
--- a/cumulus/parachains/runtimes/people/people-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/people/people-rococo/Cargo.toml
@@ -72,8 +72,8 @@ cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
 pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
 parachains-common = { workspace = true }
diff --git a/cumulus/parachains/runtimes/people/people-westend/Cargo.toml b/cumulus/parachains/runtimes/people/people-westend/Cargo.toml
index 7822df585a58356a160c693ea9abb1b171ebe70a..65bc8264934f65f9037ff041640d431f99e67ae4 100644
--- a/cumulus/parachains/runtimes/people/people-westend/Cargo.toml
+++ b/cumulus/parachains/runtimes/people/people-westend/Cargo.toml
@@ -72,8 +72,8 @@ cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
-cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+cumulus-primitives-utility = { workspace = true }
 pallet-collator-selection = { workspace = true }
 parachain-info = { workspace = true }
 parachains-common = { workspace = true }
diff --git a/cumulus/parachains/runtimes/test-utils/Cargo.toml b/cumulus/parachains/runtimes/test-utils/Cargo.toml
index 17c81ae4921ab80b374d4703f3f5dfafca3552ba..cc8f29524514ff5fc659937882fc12b893545109 100644
--- a/cumulus/parachains/runtimes/test-utils/Cargo.toml
+++ b/cumulus/parachains/runtimes/test-utils/Cargo.toml
@@ -21,27 +21,27 @@ pallet-balances = { workspace = true }
 pallet-session = { workspace = true }
 pallet-timestamp = { workspace = true }
 sp-consensus-aura = { workspace = true }
+sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
-sp-core = { workspace = true }
 
 # Cumulus
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
-pallet-collator-selection = { workspace = true }
-parachain-info = { workspace = true }
-parachains-common = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 cumulus-primitives-parachain-inherent = { workspace = true }
 cumulus-test-relay-sproof-builder = { workspace = true }
+pallet-collator-selection = { workspace = true }
+parachain-info = { workspace = true }
+parachains-common = { workspace = true }
 
 # Polkadot
+pallet-xcm = { workspace = true }
+polkadot-parachain-primitives = { workspace = true }
 xcm = { workspace = true }
 xcm-executor = { workspace = true }
-pallet-xcm = { workspace = true }
 xcm-runtime-apis = { workspace = true }
-polkadot-parachain-primitives = { workspace = true }
 
 [dev-dependencies]
 hex-literal = { workspace = true, default-features = true }
diff --git a/cumulus/parachains/runtimes/testing/penpal/Cargo.toml b/cumulus/parachains/runtimes/testing/penpal/Cargo.toml
index 3bd1e5c6f4367f12f6c854da59d039cb10254914..5b17f4f5738803aeb0b73f86296145aee94ce4ed 100644
--- a/cumulus/parachains/runtimes/testing/penpal/Cargo.toml
+++ b/cumulus/parachains/runtimes/testing/penpal/Cargo.toml
@@ -32,6 +32,9 @@ frame-system = { workspace = true }
 frame-system-benchmarking = { optional = true, workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
+pallet-asset-conversion = { workspace = true }
+pallet-asset-tx-payment = { workspace = true }
+pallet-assets = { workspace = true }
 pallet-aura = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
@@ -40,9 +43,6 @@ pallet-sudo = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
-pallet-asset-tx-payment = { workspace = true }
-pallet-assets = { workspace = true }
-pallet-asset-conversion = { workspace = true }
 sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
@@ -57,9 +57,9 @@ sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
 
 # Polkadot
-polkadot-primitives = { workspace = true }
 pallet-xcm = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
+polkadot-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
@@ -67,8 +67,8 @@ xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # Cumulus
+assets-common = { workspace = true }
 cumulus-pallet-aura-ext = { workspace = true }
-pallet-message-queue = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-session-benchmarking = { workspace = true }
 cumulus-pallet-xcm = { workspace = true }
@@ -76,9 +76,9 @@ cumulus-pallet-xcmp-queue = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 cumulus-primitives-utility = { workspace = true }
 pallet-collator-selection = { workspace = true }
+pallet-message-queue = { workspace = true }
 parachain-info = { workspace = true }
 parachains-common = { workspace = true }
-assets-common = { workspace = true }
 snowbridge-router-primitives = { workspace = true }
 
 primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "num-traits", "scale-info"] }
diff --git a/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml b/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml
index 2ddb3364fc09945174784558d825369c4877f620..e8761445f161e1f82682b40e51e35b00d37d6ca3 100644
--- a/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml
+++ b/cumulus/parachains/runtimes/testing/rococo-parachain/Cargo.toml
@@ -43,14 +43,13 @@ sp-version = { workspace = true }
 # Polkadot
 pallet-xcm = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
+polkadot-runtime-common = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
-polkadot-runtime-common = { workspace = true }
 
 # Cumulus
 cumulus-pallet-aura-ext = { workspace = true }
-pallet-message-queue = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
@@ -59,9 +58,10 @@ cumulus-primitives-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
 cumulus-primitives-utility = { workspace = true }
+pallet-message-queue = { workspace = true }
+parachain-info = { workspace = true }
 parachains-common = { workspace = true }
 testnet-parachains-constants = { features = ["rococo"], workspace = true }
-parachain-info = { workspace = true }
 
 [build-dependencies]
 substrate-wasm-builder = { optional = true, workspace = true, default-features = true }
diff --git a/cumulus/polkadot-omni-node/lib/Cargo.toml b/cumulus/polkadot-omni-node/lib/Cargo.toml
index b1937427be66d341e01f0047cd590e5bfe92e8b1..018fc88a2aeaf2018681e96a7e4baccaa17b2afa 100644
--- a/cumulus/polkadot-omni-node/lib/Cargo.toml
+++ b/cumulus/polkadot-omni-node/lib/Cargo.toml
@@ -19,11 +19,11 @@ async-trait = { workspace = true }
 clap = { features = ["derive"], workspace = true }
 codec = { workspace = true, default-features = true }
 color-print = { workspace = true }
+docify = { workspace = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
 serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
-docify = { workspace = true }
 
 # Local
 jsonrpsee = { features = ["server"], workspace = true }
@@ -34,46 +34,46 @@ subxt-metadata = { workspace = true, default-features = true }
 # Substrate
 frame-benchmarking = { optional = true, workspace = true, default-features = true }
 frame-benchmarking-cli = { workspace = true, default-features = true }
-sp-crypto-hashing = { workspace = true }
-sp-runtime = { workspace = true }
-sp-core = { workspace = true, default-features = true }
-sp-session = { workspace = true, default-features = true }
-frame-try-runtime = { optional = true, workspace = true, default-features = true }
-sc-consensus = { workspace = true, default-features = true }
 frame-support = { optional = true, workspace = true, default-features = true }
+frame-system-rpc-runtime-api = { workspace = true, default-features = true }
+frame-try-runtime = { optional = true, workspace = true, default-features = true }
+pallet-transaction-payment = { workspace = true, default-features = true }
+pallet-transaction-payment-rpc = { workspace = true, default-features = true }
+pallet-transaction-payment-rpc-runtime-api = { workspace = true, default-features = true }
+prometheus-endpoint = { workspace = true, default-features = true }
+sc-basic-authorship = { workspace = true, default-features = true }
+sc-chain-spec = { workspace = true, default-features = true }
 sc-cli = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-client-db = { workspace = true, default-features = true }
+sc-consensus = { workspace = true, default-features = true }
+sc-consensus-manual-seal = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
+sc-rpc = { workspace = true, default-features = true }
+sc-runtime-utilities = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
+sc-sysinfo = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
+sc-tracing = { workspace = true, default-features = true }
 sc-transaction-pool = { workspace = true, default-features = true }
-sp-transaction-pool = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
-sc-basic-authorship = { workspace = true, default-features = true }
-sp-timestamp = { workspace = true, default-features = true }
-sp-genesis-builder = { workspace = true }
+sp-api = { workspace = true, default-features = true }
 sp-block-builder = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-consensus-aura = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-crypto-hashing = { workspace = true }
+sp-genesis-builder = { workspace = true }
+sp-inherents = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
-sc-chain-spec = { workspace = true, default-features = true }
-sc-rpc = { workspace = true, default-features = true }
+sp-runtime = { workspace = true }
+sp-session = { workspace = true, default-features = true }
+sp-storage = { workspace = true, default-features = true }
+sp-timestamp = { workspace = true, default-features = true }
+sp-transaction-pool = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
 sp-weights = { workspace = true, default-features = true }
-sc-tracing = { workspace = true, default-features = true }
-sc-runtime-utilities = { workspace = true, default-features = true }
-sp-storage = { workspace = true, default-features = true }
-frame-system-rpc-runtime-api = { workspace = true, default-features = true }
-pallet-transaction-payment = { workspace = true, default-features = true }
-pallet-transaction-payment-rpc-runtime-api = { workspace = true, default-features = true }
-sp-inherents = { workspace = true, default-features = true }
-sp-api = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
-sp-consensus-aura = { workspace = true, default-features = true }
-sc-consensus-manual-seal = { workspace = true, default-features = true }
-sc-sysinfo = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
 substrate-frame-rpc-system = { workspace = true, default-features = true }
-pallet-transaction-payment-rpc = { workspace = true, default-features = true }
 substrate-state-trie-migration-rpc = { workspace = true, default-features = true }
 
 # Polkadot
@@ -84,9 +84,9 @@ polkadot-primitives = { workspace = true, default-features = true }
 cumulus-client-cli = { workspace = true, default-features = true }
 cumulus-client-collator = { workspace = true, default-features = true }
 cumulus-client-consensus-aura = { workspace = true, default-features = true }
-cumulus-client-consensus-relay-chain = { workspace = true, default-features = true }
 cumulus-client-consensus-common = { workspace = true, default-features = true }
 cumulus-client-consensus-proposer = { workspace = true, default-features = true }
+cumulus-client-consensus-relay-chain = { workspace = true, default-features = true }
 cumulus-client-parachain-inherent = { workspace = true, default-features = true }
 cumulus-client-service = { workspace = true, default-features = true }
 cumulus-primitives-aura = { workspace = true, default-features = true }
@@ -96,10 +96,10 @@ futures-timer = "3.0.3"
 
 [dev-dependencies]
 assert_cmd = { workspace = true }
+cumulus-test-runtime = { workspace = true }
 nix = { features = ["signal"], workspace = true }
 tokio = { version = "1.32.0", features = ["macros", "parking_lot", "time"] }
 wait-timeout = { workspace = true }
-cumulus-test-runtime = { workspace = true }
 
 [features]
 default = []
diff --git a/cumulus/polkadot-parachain/Cargo.toml b/cumulus/polkadot-parachain/Cargo.toml
index 3bfb79610448e209f11773fd7c1641b8ace2a098..9130f60ceb38b47631c9cf6f82bae350c4d35475 100644
--- a/cumulus/polkadot-parachain/Cargo.toml
+++ b/cumulus/polkadot-parachain/Cargo.toml
@@ -24,29 +24,29 @@ serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
 
 # Local
-polkadot-omni-node-lib = { features = ["rococo-native", "westend-native"], workspace = true }
-rococo-parachain-runtime = { workspace = true }
-glutton-westend-runtime = { workspace = true }
 asset-hub-rococo-runtime = { workspace = true, default-features = true }
 asset-hub-westend-runtime = { workspace = true }
+bridge-hub-rococo-runtime = { workspace = true, default-features = true }
+bridge-hub-westend-runtime = { workspace = true, default-features = true }
 collectives-westend-runtime = { workspace = true }
 contracts-rococo-runtime = { workspace = true }
-bridge-hub-rococo-runtime = { workspace = true, default-features = true }
 coretime-rococo-runtime = { workspace = true }
 coretime-westend-runtime = { workspace = true }
-bridge-hub-westend-runtime = { workspace = true, default-features = true }
+glutton-westend-runtime = { workspace = true }
+parachains-common = { workspace = true, default-features = true }
 penpal-runtime = { workspace = true }
 people-rococo-runtime = { workspace = true }
 people-westend-runtime = { workspace = true }
-parachains-common = { workspace = true, default-features = true }
+polkadot-omni-node-lib = { features = ["rococo-native", "westend-native"], workspace = true }
+rococo-parachain-runtime = { workspace = true }
 
 # Substrate
-sp-core = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
+sc-chain-spec = { workspace = true, default-features = true }
 sc-cli = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
-sc-chain-spec = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-genesis-builder = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 
 # Polkadot
 xcm = { workspace = true, default-features = true }
diff --git a/cumulus/primitives/proof-size-hostfunction/Cargo.toml b/cumulus/primitives/proof-size-hostfunction/Cargo.toml
index 6e8168091892e761700b9f4e465d4528a623a5ac..b3b300d66ef32a28c25459e7ceec0393d06285b5 100644
--- a/cumulus/primitives/proof-size-hostfunction/Cargo.toml
+++ b/cumulus/primitives/proof-size-hostfunction/Cargo.toml
@@ -12,14 +12,14 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-sp-runtime-interface = { workspace = true }
 sp-externalities = { workspace = true }
+sp-runtime-interface = { workspace = true }
 sp-trie = { workspace = true }
 
 [dev-dependencies]
-sp-state-machine = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
+sp-state-machine = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/primitives/storage-weight-reclaim/Cargo.toml b/cumulus/primitives/storage-weight-reclaim/Cargo.toml
index 3c358bc25edb2e8d73378481fc25cabd4690fc42..4bcbabc1f16c35f97f006162a1e3fc7ec6599644 100644
--- a/cumulus/primitives/storage-weight-reclaim/Cargo.toml
+++ b/cumulus/primitives/storage-weight-reclaim/Cargo.toml
@@ -27,9 +27,9 @@ cumulus-primitives-proof-size-hostfunction = { workspace = true }
 docify = { workspace = true }
 
 [dev-dependencies]
+cumulus-test-runtime = { workspace = true }
 sp-io = { workspace = true }
 sp-trie = { workspace = true }
-cumulus-test-runtime = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/cumulus/primitives/utility/Cargo.toml b/cumulus/primitives/utility/Cargo.toml
index f26e34a2950963fabe2a102f8da34572cf73b8f6..84039b9345b271f144b18bff04132f75ef989c5b 100644
--- a/cumulus/primitives/utility/Cargo.toml
+++ b/cumulus/primitives/utility/Cargo.toml
@@ -17,14 +17,14 @@ log = { workspace = true }
 
 # Substrate
 frame-support = { workspace = true }
-sp-runtime = { workspace = true }
 pallet-asset-conversion = { workspace = true }
+sp-runtime = { workspace = true }
 
 # Polkadot
 polkadot-runtime-common = { workspace = true }
 xcm = { workspace = true }
-xcm-executor = { workspace = true }
 xcm-builder = { workspace = true }
+xcm-executor = { workspace = true }
 
 # Cumulus
 cumulus-primitives-core = { workspace = true }
diff --git a/cumulus/test/client/Cargo.toml b/cumulus/test/client/Cargo.toml
index 33023816c718cd0a41335e8481fb6428ea6b6bdb..2c72ca98f35a07a8c148559530ad2e7ee327a958 100644
--- a/cumulus/test/client/Cargo.toml
+++ b/cumulus/test/client/Cargo.toml
@@ -12,40 +12,40 @@ workspace = true
 codec = { features = ["derive"], workspace = true }
 
 # Substrate
-sc-service = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
+pallet-transaction-payment = { workspace = true, default-features = true }
+sc-block-builder = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-consensus-aura = { workspace = true, default-features = true }
-sc-block-builder = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
 sc-executor-common = { workspace = true, default-features = true }
-substrate-test-client = { workspace = true }
-sp-application-crypto = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
+sc-service = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-consensus-aura = { workspace = true, default-features = true }
+sp-application-crypto = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
+sp-consensus-aura = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true, default-features = true }
-frame-system = { workspace = true, default-features = true }
-pallet-transaction-payment = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
+substrate-test-client = { workspace = true }
 
 # Polkadot
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 # Cumulus
-cumulus-test-runtime = { workspace = true }
-cumulus-test-service = { workspace = true }
-cumulus-test-relay-sproof-builder = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
-cumulus-primitives-proof-size-hostfunction = { workspace = true, default-features = true }
 cumulus-primitives-parachain-inherent = { workspace = true, default-features = true }
+cumulus-primitives-proof-size-hostfunction = { workspace = true, default-features = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true, default-features = true }
+cumulus-test-relay-sproof-builder = { workspace = true, default-features = true }
+cumulus-test-runtime = { workspace = true }
+cumulus-test-service = { workspace = true }
 
 [features]
 runtime-benchmarks = [
diff --git a/cumulus/test/runtime/Cargo.toml b/cumulus/test/runtime/Cargo.toml
index b80170af3e83de7f886f438d56b71ace187c71b8..150838e5e96e774961a004ba699f6db10fc62f49 100644
--- a/cumulus/test/runtime/Cargo.toml
+++ b/cumulus/test/runtime/Cargo.toml
@@ -18,37 +18,37 @@ frame-executive = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
+pallet-aura = { workspace = true }
+pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
+pallet-glutton = { workspace = true }
 pallet-message-queue = { workspace = true }
+pallet-session = { workspace = true }
 pallet-sudo = { workspace = true }
-pallet-aura = { workspace = true }
-pallet-authorship = { workspace = true }
 pallet-timestamp = { workspace = true }
-pallet-glutton = { workspace = true }
 pallet-transaction-payment = { workspace = true }
-pallet-session = { workspace = true }
 sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
+sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
 sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
 sp-io = { workspace = true }
+sp-keyring = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
-sp-consensus-aura = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
-sp-keyring = { workspace = true }
 
 # Cumulus
+cumulus-pallet-aura-ext = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
-parachain-info = { workspace = true }
 cumulus-primitives-aura = { workspace = true }
-pallet-collator-selection = { workspace = true }
-cumulus-pallet-aura-ext = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true }
+pallet-collator-selection = { workspace = true }
+parachain-info = { workspace = true }
 
 [build-dependencies]
 substrate-wasm-builder = { optional = true, workspace = true, default-features = true }
diff --git a/cumulus/test/service/Cargo.toml b/cumulus/test/service/Cargo.toml
index 86a8c48bb54fa0e54296139612d919573d67d5f8..b3d92444c7d1ff90e8ac02423c9dc2b7509cbf72 100644
--- a/cumulus/test/service/Cargo.toml
+++ b/cumulus/test/service/Cargo.toml
@@ -22,80 +22,80 @@ prometheus = { workspace = true }
 rand = { workspace = true, default-features = true }
 serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
+tempfile = { workspace = true }
 tokio = { features = ["macros"], workspace = true, default-features = true }
 tracing = { workspace = true, default-features = true }
 url = { workspace = true }
-tempfile = { workspace = true }
 
 # Substrate
 frame-system = { workspace = true, default-features = true }
 frame-system-rpc-runtime-api = { workspace = true, default-features = true }
 pallet-transaction-payment = { workspace = true, default-features = true }
 sc-basic-authorship = { workspace = true, default-features = true }
+sc-block-builder = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true, default-features = true }
+sc-cli = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-consensus-aura = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
+sc-executor-common = { workspace = true, default-features = true }
+sc-executor-wasmtime = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
+sc-telemetry = { workspace = true, default-features = true }
 sc-tracing = { workspace = true, default-features = true }
 sc-transaction-pool = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
-sc-telemetry = { workspace = true, default-features = true }
+sp-api = { workspace = true, default-features = true }
 sp-arithmetic = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-consensus-aura = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+sp-genesis-builder = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-sp-api = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
-sp-genesis-builder = { workspace = true, default-features = true }
 sp-runtime = { workspace = true }
 sp-state-machine = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
-sp-consensus-aura = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 substrate-test-client = { workspace = true }
-sc-cli = { workspace = true, default-features = true }
-sc-block-builder = { workspace = true, default-features = true }
-sc-executor-wasmtime = { workspace = true, default-features = true }
-sc-executor-common = { workspace = true, default-features = true }
 
 # Polkadot
-polkadot-primitives = { workspace = true, default-features = true }
-polkadot-service = { workspace = true, default-features = true }
-polkadot-test-service = { workspace = true }
 polkadot-cli = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
+polkadot-service = { workspace = true, default-features = true }
+polkadot-test-service = { workspace = true }
 
 # Cumulus
 cumulus-client-cli = { workspace = true, default-features = true }
-parachains-common = { workspace = true, default-features = true }
+cumulus-client-collator = { workspace = true, default-features = true }
+cumulus-client-consensus-aura = { workspace = true, default-features = true }
 cumulus-client-consensus-common = { workspace = true, default-features = true }
 cumulus-client-consensus-proposer = { workspace = true, default-features = true }
-cumulus-client-consensus-aura = { workspace = true, default-features = true }
 cumulus-client-consensus-relay-chain = { workspace = true, default-features = true }
 cumulus-client-parachain-inherent = { workspace = true, default-features = true }
+cumulus-client-pov-recovery = { workspace = true, default-features = true }
 cumulus-client-service = { workspace = true, default-features = true }
-cumulus-client-collator = { workspace = true, default-features = true }
+cumulus-pallet-parachain-system = { workspace = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
+cumulus-primitives-storage-weight-reclaim = { workspace = true, default-features = true }
 cumulus-relay-chain-inprocess-interface = { workspace = true, default-features = true }
 cumulus-relay-chain-interface = { workspace = true, default-features = true }
-cumulus-test-runtime = { workspace = true }
 cumulus-relay-chain-minimal-node = { workspace = true, default-features = true }
-cumulus-client-pov-recovery = { workspace = true, default-features = true }
 cumulus-test-relay-sproof-builder = { workspace = true, default-features = true }
-cumulus-pallet-parachain-system = { workspace = true }
-cumulus-primitives-storage-weight-reclaim = { workspace = true, default-features = true }
+cumulus-test-runtime = { workspace = true }
 pallet-timestamp = { workspace = true, default-features = true }
+parachains-common = { workspace = true, default-features = true }
 
 [dev-dependencies]
+cumulus-test-client = { workspace = true }
 futures = { workspace = true }
 portpicker = { workspace = true }
 sp-authority-discovery = { workspace = true, default-features = true }
-cumulus-test-client = { workspace = true }
 
 # Polkadot dependencies
 polkadot-test-service = { workspace = true }
diff --git a/cumulus/xcm/xcm-emulator/Cargo.toml b/cumulus/xcm/xcm-emulator/Cargo.toml
index d0c637d64d01923dd757c67f5570a0c97be6dbb6..ae8cb79bb55e1dd49fb35955f156b68935dc4303 100644
--- a/cumulus/xcm/xcm-emulator/Cargo.toml
+++ b/cumulus/xcm/xcm-emulator/Cargo.toml
@@ -12,36 +12,36 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+array-bytes = { workspace = true }
 codec = { workspace = true, default-features = true }
-paste = { workspace = true, default-features = true }
-log = { workspace = true }
 impl-trait-for-tuples = { workspace = true }
-array-bytes = { workspace = true }
+log = { workspace = true }
+paste = { workspace = true, default-features = true }
 
 # Substrate
 frame-support = { workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
+pallet-message-queue = { workspace = true, default-features = true }
+sp-arithmetic = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-arithmetic = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
-pallet-message-queue = { workspace = true, default-features = true }
 
 # Cumulus
-cumulus-primitives-core = { workspace = true, default-features = true }
-cumulus-pallet-xcmp-queue = { workspace = true, default-features = true }
 cumulus-pallet-parachain-system = { workspace = true, default-features = true }
+cumulus-pallet-xcmp-queue = { workspace = true, default-features = true }
+cumulus-primitives-core = { workspace = true, default-features = true }
 cumulus-primitives-parachain-inherent = { workspace = true, default-features = true }
 cumulus-test-relay-sproof-builder = { workspace = true, default-features = true }
 parachains-common = { workspace = true, default-features = true }
 
 # Polkadot
-xcm = { workspace = true, default-features = true }
-xcm-executor = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 polkadot-runtime-parachains = { workspace = true, default-features = true }
+xcm = { workspace = true, default-features = true }
+xcm-executor = { workspace = true, default-features = true }
diff --git a/docs/sdk/Cargo.toml b/docs/sdk/Cargo.toml
index 0e4a5c001382d6b088c0d07e6272cf3a8fb89bcf..a856e94f42b51ea3417775e6a694e688134d70ab 100644
--- a/docs/sdk/Cargo.toml
+++ b/docs/sdk/Cargo.toml
@@ -16,112 +16,112 @@ workspace = true
 [dependencies]
 # Needed for all FRAME-based code
 codec = { workspace = true }
-scale-info = { workspace = true }
 frame = { features = [
 	"experimental",
 	"runtime",
 ], workspace = true, default-features = true }
-pallet-examples = { workspace = true }
 pallet-contracts = { workspace = true }
 pallet-default-config-example = { workspace = true, default-features = true }
 pallet-example-offchain-worker = { workspace = true, default-features = true }
+pallet-examples = { workspace = true }
+scale-info = { workspace = true }
 
 # How we build docs in rust-docs
-simple-mermaid = "0.1.1"
 docify = { workspace = true }
 serde_json = { workspace = true }
+simple-mermaid = "0.1.1"
 
 # Polkadot SDK deps, typically all should only be in scope such that we can link to their doc item.
-polkadot-sdk = { features = ["runtime-full"], workspace = true, default-features = true }
-node-cli = { workspace = true }
-kitchensink-runtime = { workspace = true }
 chain-spec-builder = { workspace = true, default-features = true }
-subkey = { workspace = true, default-features = true }
-frame-system = { workspace = true }
-frame-support = { workspace = true }
-frame-executive = { workspace = true }
 frame-benchmarking = { workspace = true }
-pallet-example-authorization-tx-extension = { workspace = true, default-features = true }
-pallet-example-single-block-migrations = { workspace = true, default-features = true }
+frame-executive = { workspace = true }
 frame-metadata-hash-extension = { workspace = true, default-features = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+kitchensink-runtime = { workspace = true }
 log = { workspace = true, default-features = true }
+node-cli = { workspace = true }
+pallet-example-authorization-tx-extension = { workspace = true, default-features = true }
+pallet-example-single-block-migrations = { workspace = true, default-features = true }
+polkadot-sdk = { features = ["runtime-full"], workspace = true, default-features = true }
+subkey = { workspace = true, default-features = true }
 
 # Substrate Client
-sc-network = { workspace = true, default-features = true }
-sc-rpc-api = { workspace = true, default-features = true }
-sc-rpc = { workspace = true, default-features = true }
-sc-client-db = { workspace = true, default-features = true }
+sc-chain-spec = { workspace = true, default-features = true }
 sc-cli = { workspace = true, default-features = true }
+sc-client-db = { workspace = true, default-features = true }
 sc-consensus-aura = { workspace = true, default-features = true }
 sc-consensus-babe = { workspace = true, default-features = true }
-sc-consensus-grandpa = { workspace = true, default-features = true }
 sc-consensus-beefy = { workspace = true, default-features = true }
+sc-consensus-grandpa = { workspace = true, default-features = true }
 sc-consensus-manual-seal = { workspace = true, default-features = true }
 sc-consensus-pow = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
+sc-rpc = { workspace = true, default-features = true }
+sc-rpc-api = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
-sc-chain-spec = { workspace = true, default-features = true }
 
 substrate-wasm-builder = { workspace = true, default-features = true }
 
 # Cumulus
+cumulus-client-service = { workspace = true, default-features = true }
 cumulus-pallet-aura-ext = { workspace = true, default-features = true }
 cumulus-pallet-parachain-system = { workspace = true, default-features = true }
-parachain-info = { workspace = true, default-features = true }
 cumulus-primitives-proof-size-hostfunction = { workspace = true, default-features = true }
-cumulus-client-service = { workspace = true, default-features = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true, default-features = true }
+parachain-info = { workspace = true, default-features = true }
 
 # Omni Node
 polkadot-omni-node-lib = { workspace = true, default-features = true }
 
 # Pallets and FRAME internals
-pallet-aura = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
-pallet-assets = { workspace = true, default-features = true }
-pallet-preimage = { workspace = true, default-features = true }
-pallet-transaction-payment = { workspace = true, default-features = true }
-pallet-asset-tx-payment = { workspace = true, default-features = true }
-pallet-skip-feeless-payment = { workspace = true, default-features = true }
 pallet-asset-conversion-tx-payment = { workspace = true, default-features = true }
-pallet-utility = { workspace = true, default-features = true }
-pallet-multisig = { workspace = true, default-features = true }
-pallet-proxy = { workspace = true, default-features = true }
+pallet-asset-tx-payment = { workspace = true, default-features = true }
+pallet-assets = { workspace = true, default-features = true }
+pallet-aura = { workspace = true, default-features = true }
 pallet-authorship = { workspace = true, default-features = true }
+pallet-babe = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
+pallet-broker = { workspace = true, default-features = true }
 pallet-collective = { workspace = true, default-features = true }
 pallet-democracy = { workspace = true, default-features = true }
-pallet-uniques = { workspace = true, default-features = true }
+pallet-grandpa = { workspace = true, default-features = true }
+pallet-multisig = { workspace = true, default-features = true }
 pallet-nfts = { workspace = true, default-features = true }
-pallet-scheduler = { workspace = true, default-features = true }
+pallet-preimage = { workspace = true, default-features = true }
+pallet-proxy = { workspace = true, default-features = true }
 pallet-referenda = { workspace = true, default-features = true }
-pallet-broker = { workspace = true, default-features = true }
-pallet-babe = { workspace = true, default-features = true }
-pallet-grandpa = { workspace = true, default-features = true }
+pallet-scheduler = { workspace = true, default-features = true }
+pallet-skip-feeless-payment = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
+pallet-transaction-payment = { workspace = true, default-features = true }
+pallet-uniques = { workspace = true, default-features = true }
+pallet-utility = { workspace = true, default-features = true }
 
 # Primitives
-sp-io = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
-sp-runtime-interface = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 sp-arithmetic = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-genesis-builder = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 sp-offchain = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-runtime-interface = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
 sp-weights = { workspace = true, default-features = true }
 
 
 # XCM
+pallet-xcm = { workspace = true }
 xcm = { workspace = true, default-features = true }
 xcm-builder = { workspace = true }
 xcm-docs = { workspace = true }
 xcm-executor = { workspace = true }
 xcm-simulator = { workspace = true }
-pallet-xcm = { workspace = true }
 
 # runtime guides
 
@@ -129,12 +129,12 @@ chain-spec-guide-runtime = { workspace = true, default-features = true }
 
 # Templates
 minimal-template-runtime = { workspace = true, default-features = true }
-solochain-template-runtime = { workspace = true, default-features = true }
 parachain-template-runtime = { workspace = true, default-features = true }
+solochain-template-runtime = { workspace = true, default-features = true }
 
 # local packages
-first-runtime = { workspace = true, default-features = true }
 first-pallet = { workspace = true, default-features = true }
+first-runtime = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_cmd = "2.0.14"
diff --git a/docs/sdk/packages/guides/first-pallet/Cargo.toml b/docs/sdk/packages/guides/first-pallet/Cargo.toml
index dad5b88634945ec02ec5da793ba93ae4e831543a..a1411580119da456e389715c0f47bc2df8691c8f 100644
--- a/docs/sdk/packages/guides/first-pallet/Cargo.toml
+++ b/docs/sdk/packages/guides/first-pallet/Cargo.toml
@@ -17,9 +17,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { workspace = true }
-frame = { workspace = true, features = ["experimental", "runtime"] }
 docify = { workspace = true }
+frame = { workspace = true, features = ["experimental", "runtime"] }
+scale-info = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/docs/sdk/src/reference_docs/chain_spec_runtime/Cargo.toml b/docs/sdk/src/reference_docs/chain_spec_runtime/Cargo.toml
index 307e2daa38c62d2f1bba2ab59f9d78c99494d65f..925cb7bb2e65498a14d1ca0c7428ceb06dc5ccc7 100644
--- a/docs/sdk/src/reference_docs/chain_spec_runtime/Cargo.toml
+++ b/docs/sdk/src/reference_docs/chain_spec_runtime/Cargo.toml
@@ -10,8 +10,8 @@ edition.workspace = true
 publish = false
 
 [dependencies]
-docify = { workspace = true }
 codec = { workspace = true }
+docify = { workspace = true }
 frame-support = { workspace = true }
 scale-info = { workspace = true }
 serde = { workspace = true }
@@ -31,11 +31,11 @@ pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 
 # genesis builder that allows us to interact with runtime genesis config
-sp-genesis-builder = { workspace = true }
-sp-runtime = { features = ["serde"], workspace = true }
+sp-application-crypto = { features = ["serde"], workspace = true }
 sp-core = { workspace = true }
+sp-genesis-builder = { workspace = true }
 sp-keyring = { workspace = true }
-sp-application-crypto = { features = ["serde"], workspace = true }
+sp-runtime = { features = ["serde"], workspace = true }
 
 [build-dependencies]
 substrate-wasm-builder = { optional = true, workspace = true, default-features = true }
diff --git a/polkadot/Cargo.toml b/polkadot/Cargo.toml
index 101caac0e313c36827cf56a67d033e7e184e3e85..ded8157ad90ecbcc6fead4cb9675144752f0c15b 100644
--- a/polkadot/Cargo.toml
+++ b/polkadot/Cargo.toml
@@ -46,10 +46,10 @@ tikv-jemallocator = { version = "0.5.0", features = ["unprefixed_malloc_on_suppo
 [dev-dependencies]
 assert_cmd = { workspace = true }
 nix = { features = ["signal"], workspace = true }
+polkadot-core-primitives = { workspace = true, default-features = true }
+substrate-rpc-client = { workspace = true, default-features = true }
 tempfile = { workspace = true }
 tokio = { workspace = true, default-features = true }
-substrate-rpc-client = { workspace = true, default-features = true }
-polkadot-core-primitives = { workspace = true, default-features = true }
 
 [build-dependencies]
 substrate-build-script-utils = { workspace = true, default-features = true }
diff --git a/polkadot/cli/Cargo.toml b/polkadot/cli/Cargo.toml
index 3eff525b7b1e6d8e6b0b7ea736e0264657178b27..6909d142b3a632b7ff90ce2deeb2e271ed065a20 100644
--- a/polkadot/cli/Cargo.toml
+++ b/polkadot/cli/Cargo.toml
@@ -22,27 +22,27 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 cfg-if = { workspace = true }
 clap = { features = ["derive"], optional = true, workspace = true }
-log = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 futures = { workspace = true }
+log = { workspace = true, default-features = true }
 pyroscope = { optional = true, workspace = true }
 pyroscope_pprofrs = { optional = true, workspace = true }
+thiserror = { workspace = true }
 
 polkadot-service = { optional = true, workspace = true }
 
-sp-core = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-maybe-compressed-blob = { workspace = true, default-features = true }
 frame-benchmarking-cli = { optional = true, workspace = true, default-features = true }
-sc-cli = { optional = true, workspace = true, default-features = true }
-sc-service = { optional = true, workspace = true, default-features = true }
 polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
-sc-tracing = { optional = true, workspace = true, default-features = true }
-sc-sysinfo = { workspace = true, default-features = true }
+sc-cli = { optional = true, workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
+sc-service = { optional = true, workspace = true, default-features = true }
 sc-storage-monitor = { workspace = true, default-features = true }
+sc-sysinfo = { workspace = true, default-features = true }
+sc-tracing = { optional = true, workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-maybe-compressed-blob = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 
 [build-dependencies]
diff --git a/polkadot/core-primitives/Cargo.toml b/polkadot/core-primitives/Cargo.toml
index 33869f216f7840ffee92030a4d51f2041ee790b0..1fb14e9d58e7ef768bdd4cf83ca8165ec1967c83 100644
--- a/polkadot/core-primitives/Cargo.toml
+++ b/polkadot/core-primitives/Cargo.toml
@@ -12,10 +12,10 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+codec = { features = ["derive"], workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-codec = { features = ["derive"], workspace = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/erasure-coding/Cargo.toml b/polkadot/erasure-coding/Cargo.toml
index 528b955c4db3772577e483d3aeaa1b23c64b6e57..ba712a89613b8b952ccc041c91276699fdccec8d 100644
--- a/polkadot/erasure-coding/Cargo.toml
+++ b/polkadot/erasure-coding/Cargo.toml
@@ -12,17 +12,17 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-polkadot-primitives = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
-novelpoly = { workspace = true }
 codec = { features = ["derive", "std"], workspace = true }
+novelpoly = { workspace = true }
+polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-trie = { workspace = true, default-features = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
-quickcheck = { workspace = true }
 criterion = { features = ["cargo_bench_support"], workspace = true }
+quickcheck = { workspace = true }
 
 [[bench]]
 name = "scaling_with_validators"
diff --git a/polkadot/erasure-coding/fuzzer/Cargo.toml b/polkadot/erasure-coding/fuzzer/Cargo.toml
index 6f451f0319b23dee9ebbf08726dd4550f518e95d..5f1c2bda40580b4fa3ec0d9cecdb8b635aba84f5 100644
--- a/polkadot/erasure-coding/fuzzer/Cargo.toml
+++ b/polkadot/erasure-coding/fuzzer/Cargo.toml
@@ -10,10 +10,10 @@ publish = false
 workspace = true
 
 [dependencies]
-polkadot-erasure-coding = { workspace = true, default-features = true }
 honggfuzz = { workspace = true }
-polkadot-primitives = { workspace = true, default-features = true }
+polkadot-erasure-coding = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 [[bin]]
 name = "reconstruct"
diff --git a/polkadot/node/collation-generation/Cargo.toml b/polkadot/node/collation-generation/Cargo.toml
index c1716e2e6eb8c400978ac7e50ace696c47cb9d6c..eb9568cc22bc17720943ef1fe0aae5a2c050ba91 100644
--- a/polkadot/node/collation-generation/Cargo.toml
+++ b/polkadot/node/collation-generation/Cargo.toml
@@ -12,6 +12,7 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+codec = { features = ["bit-vec", "derive"], workspace = true }
 futures = { workspace = true }
 gum = { workspace = true, default-features = true }
 polkadot-erasure-coding = { workspace = true, default-features = true }
@@ -19,16 +20,15 @@ polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
+schnellru = { workspace = true }
 sp-core = { workspace = true, default-features = true }
 sp-maybe-compressed-blob = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-codec = { features = ["bit-vec", "derive"], workspace = true }
-schnellru = { workspace = true }
 
 [dev-dependencies]
+assert_matches = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
+polkadot-primitives = { workspace = true, features = ["test"] }
 polkadot-primitives-test-helpers = { workspace = true }
-assert_matches = { workspace = true }
 rstest = { workspace = true }
 sp-keyring = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, features = ["test"] }
diff --git a/polkadot/node/core/approval-voting-parallel/Cargo.toml b/polkadot/node/core/approval-voting-parallel/Cargo.toml
index 995687fb4c112b6ecc113249cc63d808d6859952..a3b3e97da4972a5fbbf4b4da2e7e0b670f28a0d7 100644
--- a/polkadot/node/core/approval-voting-parallel/Cargo.toml
+++ b/polkadot/node/core/approval-voting-parallel/Cargo.toml
@@ -19,38 +19,38 @@ gum = { workspace = true }
 itertools = { workspace = true }
 thiserror = { workspace = true }
 
-polkadot-node-core-approval-voting = { workspace = true, default-features = true }
 polkadot-approval-distribution = { workspace = true, default-features = true }
+polkadot-node-core-approval-voting = { workspace = true, default-features = true }
+polkadot-node-metrics = { workspace = true, default-features = true }
+polkadot-node-network-protocol = { workspace = true, default-features = true }
+polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
-polkadot-node-network-protocol = { workspace = true, default-features = true }
-polkadot-node-metrics = { workspace = true, default-features = true }
 
 sc-keystore = { workspace = true, default-features = false }
+sp-application-crypto = { workspace = true, default-features = false, features = ["full_crypto"] }
 sp-consensus = { workspace = true, default-features = false }
 sp-consensus-slots = { workspace = true, default-features = false }
-sp-application-crypto = { workspace = true, default-features = false, features = ["full_crypto"] }
 sp-runtime = { workspace = true, default-features = false }
 
 rand = { workspace = true }
-rand_core = { workspace = true }
 rand_chacha = { workspace = true }
+rand_core = { workspace = true }
 
 [dev-dependencies]
+assert_matches = { workspace = true }
 async-trait = { workspace = true }
+kvdb-memorydb = { workspace = true }
+log = { workspace = true, default-features = true }
 parking_lot = { workspace = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
-sp-tracing = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true, default-features = true }
-assert_matches = { workspace = true }
-kvdb-memorydb = { workspace = true }
 polkadot-primitives-test-helpers = { workspace = true, default-features = true }
-log = { workspace = true, default-features = true }
 polkadot-subsystem-bench = { workspace = true, default-features = true }
 schnorrkel = { workspace = true, default-features = true }
+sp-consensus-babe = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-tracing = { workspace = true }
diff --git a/polkadot/node/core/approval-voting/Cargo.toml b/polkadot/node/core/approval-voting/Cargo.toml
index 80f5dcb7f318fcc4c1a3e4eaf25d1bd1c1ac6c75..2c292ba5efcbd640e8addc7ae2034c177cfc6f86 100644
--- a/polkadot/node/core/approval-voting/Cargo.toml
+++ b/polkadot/node/core/approval-voting/Cargo.toml
@@ -12,50 +12,50 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+async-trait = { workspace = true }
+bitvec = { features = ["alloc"], workspace = true }
+codec = { features = ["bit-vec", "derive"], workspace = true }
+derive_more = { workspace = true, default-features = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
-codec = { features = ["bit-vec", "derive"], workspace = true }
 gum = { workspace = true, default-features = true }
-bitvec = { features = ["alloc"], workspace = true }
-schnellru = { workspace = true }
+itertools = { workspace = true }
+kvdb = { workspace = true }
 merlin = { workspace = true, default-features = true }
+schnellru = { workspace = true }
 schnorrkel = { workspace = true, default-features = true }
-kvdb = { workspace = true }
-derive_more = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-itertools = { workspace = true }
-async-trait = { workspace = true }
 
+polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
 
 sc-keystore = { workspace = true }
+sp-application-crypto = { features = ["full_crypto"], workspace = true }
 sp-consensus = { workspace = true }
 sp-consensus-slots = { workspace = true }
-sp-application-crypto = { features = ["full_crypto"], workspace = true }
 sp-runtime = { workspace = true }
 # rand_core should match schnorrkel
-rand_core = { workspace = true }
-rand_chacha = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
+rand_chacha = { workspace = true, default-features = true }
+rand_core = { workspace = true }
 
 [dev-dependencies]
+assert_matches = { workspace = true }
 async-trait = { workspace = true }
+kvdb-memorydb = { workspace = true }
+log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
-assert_matches = { workspace = true }
-kvdb-memorydb = { workspace = true }
+polkadot-primitives = { workspace = true, features = ["test"] }
 polkadot-primitives-test-helpers = { workspace = true }
-log = { workspace = true, default-features = true }
+sp-consensus-babe = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
 sp-tracing = { workspace = true }
-polkadot-primitives = { workspace = true, features = ["test"] }
 
 polkadot-subsystem-bench = { workspace = true }
 
diff --git a/polkadot/node/core/av-store/Cargo.toml b/polkadot/node/core/av-store/Cargo.toml
index 9f6864269cef2704ba084edc19cbe92d5d80369b..f3bd1f09caeadb4dd271f96befb70387bccb7d36 100644
--- a/polkadot/node/core/av-store/Cargo.toml
+++ b/polkadot/node/core/av-store/Cargo.toml
@@ -12,31 +12,31 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+bitvec = { workspace = true, default-features = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
+gum = { workspace = true, default-features = true }
 kvdb = { workspace = true }
 thiserror = { workspace = true }
-gum = { workspace = true, default-features = true }
-bitvec = { workspace = true, default-features = true }
 
 codec = { features = ["derive"], workspace = true, default-features = true }
 polkadot-erasure-coding = { workspace = true, default-features = true }
+polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
 sp-consensus = { workspace = true }
 
 [dev-dependencies]
-log = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
 kvdb-memorydb = { workspace = true }
+log = { workspace = true, default-features = true }
 sp-tracing = { workspace = true }
 
-sp-core = { workspace = true, default-features = true }
-polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-node-subsystem-test-helpers = { workspace = true }
-sp-keyring = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
+polkadot-node-subsystem-test-helpers = { workspace = true }
+polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-primitives-test-helpers = { workspace = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
diff --git a/polkadot/node/core/backing/Cargo.toml b/polkadot/node/core/backing/Cargo.toml
index a81fe9486c63f086909ffb6c1cc69fbae385edd5..be829a84ee6ea30f4b32e25902da4537ae110ae5 100644
--- a/polkadot/node/core/backing/Cargo.toml
+++ b/polkadot/node/core/backing/Cargo.toml
@@ -12,30 +12,30 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+bitvec = { features = ["alloc"], workspace = true }
+fatality = { workspace = true }
 futures = { workspace = true }
-sp-keystore = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
+gum = { workspace = true, default-features = true }
+polkadot-erasure-coding = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
-polkadot-parachain-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-erasure-coding = { workspace = true, default-features = true }
+polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 polkadot-statement-table = { workspace = true, default-features = true }
-bitvec = { features = ["alloc"], workspace = true }
-gum = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-fatality = { workspace = true }
 schnellru = { workspace = true }
+sp-keystore = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-sp-core = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
-futures = { features = ["thread-pool"], workspace = true }
 assert_matches = { workspace = true }
-rstest = { workspace = true }
+futures = { features = ["thread-pool"], workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
-polkadot-primitives-test-helpers = { workspace = true }
 polkadot-primitives = { workspace = true, features = ["test"] }
+polkadot-primitives-test-helpers = { workspace = true }
+rstest = { workspace = true }
+sc-keystore = { workspace = true, default-features = true }
+sp-application-crypto = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
diff --git a/polkadot/node/core/bitfield-signing/Cargo.toml b/polkadot/node/core/bitfield-signing/Cargo.toml
index f00ba57126615705298ca3d6c07fe152e68c664d..e75404729dbdba3cc42cd47b2f04827161f19312 100644
--- a/polkadot/node/core/bitfield-signing/Cargo.toml
+++ b/polkadot/node/core/bitfield-signing/Cargo.toml
@@ -14,12 +14,12 @@ workspace = true
 [dependencies]
 futures = { workspace = true }
 gum = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
-wasm-timer = { workspace = true }
 thiserror = { workspace = true }
+wasm-timer = { workspace = true }
 
 [dev-dependencies]
 polkadot-node-subsystem-test-helpers = { workspace = true }
diff --git a/polkadot/node/core/candidate-validation/Cargo.toml b/polkadot/node/core/candidate-validation/Cargo.toml
index fea16b1c7604fe13e442fa405bfa7179fa7aa07e..e92976609f9e89cfbe55707517c37e54af17072e 100644
--- a/polkadot/node/core/candidate-validation/Cargo.toml
+++ b/polkadot/node/core/candidate-validation/Cargo.toml
@@ -17,28 +17,28 @@ futures = { workspace = true }
 futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
 
-sp-keystore = { workspace = true }
-sp-application-crypto = { workspace = true }
 codec = { features = ["bit-vec", "derive"], workspace = true }
+sp-application-crypto = { workspace = true }
+sp-keystore = { workspace = true }
 
-polkadot-primitives = { workspace = true, default-features = true }
-polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
+polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 [target.'cfg(not(any(target_os = "android", target_os = "unknown")))'.dependencies]
 polkadot-node-core-pvf = { workspace = true, default-features = true }
 
 [dev-dependencies]
-sp-keyring = { workspace = true, default-features = true }
-futures = { features = ["thread-pool"], workspace = true }
 assert_matches = { workspace = true }
+futures = { features = ["thread-pool"], workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
-sp-maybe-compressed-blob = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, features = ["test"] }
 polkadot-primitives-test-helpers = { workspace = true }
 rstest = { workspace = true }
-polkadot-primitives = { workspace = true, features = ["test"] }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-maybe-compressed-blob = { workspace = true, default-features = true }
diff --git a/polkadot/node/core/chain-api/Cargo.toml b/polkadot/node/core/chain-api/Cargo.toml
index 0f443868dada6aa887b035429cbcbb90dcf26fe2..0689a41233c7913c56ea8034e91921a6b7a97696 100644
--- a/polkadot/node/core/chain-api/Cargo.toml
+++ b/polkadot/node/core/chain-api/Cargo.toml
@@ -21,11 +21,11 @@ sc-client-api = { workspace = true, default-features = true }
 sc-consensus-babe = { workspace = true, default-features = true }
 
 [dev-dependencies]
+codec = { workspace = true, default-features = true }
 futures = { features = ["thread-pool"], workspace = true }
 maplit = { workspace = true }
-codec = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
-sp-core = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
diff --git a/polkadot/node/core/chain-selection/Cargo.toml b/polkadot/node/core/chain-selection/Cargo.toml
index d2cc425a4816f49ed2b4fe92f177835cbd7d867b..e425b9f862a5e691c4e2f963ed7b410366a4abf8 100644
--- a/polkadot/node/core/chain-selection/Cargo.toml
+++ b/polkadot/node/core/chain-selection/Cargo.toml
@@ -12,20 +12,20 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+codec = { workspace = true, default-features = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
+kvdb = { workspace = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
-kvdb = { workspace = true }
+polkadot-primitives = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-codec = { workspace = true, default-features = true }
 
 [dev-dependencies]
-polkadot-node-subsystem-test-helpers = { workspace = true }
-sp-core = { workspace = true, default-features = true }
-parking_lot = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
 kvdb-memorydb = { workspace = true }
+parking_lot = { workspace = true, default-features = true }
+polkadot-node-subsystem-test-helpers = { workspace = true }
+sp-core = { workspace = true, default-features = true }
diff --git a/polkadot/node/core/dispute-coordinator/Cargo.toml b/polkadot/node/core/dispute-coordinator/Cargo.toml
index 11b4ac645c238e9745a754bcfb394cedb7292124..6eb3020a0432f2b5f7b97e8ff7f05dfb7ceabb0e 100644
--- a/polkadot/node/core/dispute-coordinator/Cargo.toml
+++ b/polkadot/node/core/dispute-coordinator/Cargo.toml
@@ -12,34 +12,34 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+codec = { workspace = true, default-features = true }
+fatality = { workspace = true }
 futures = { workspace = true }
 gum = { workspace = true, default-features = true }
-codec = { workspace = true, default-features = true }
 kvdb = { workspace = true }
-thiserror = { workspace = true }
 schnellru = { workspace = true }
-fatality = { workspace = true }
+thiserror = { workspace = true }
 
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 sc-keystore = { workspace = true, default-features = true }
 
 
 [dev-dependencies]
+assert_matches = { workspace = true }
+futures-timer = { workspace = true }
 kvdb-memorydb = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-assert_matches = { workspace = true }
+polkadot-primitives = { workspace = true, features = ["test"] }
 polkadot-primitives-test-helpers = { workspace = true }
-futures-timer = { workspace = true }
 sp-application-crypto = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, features = ["test"] }
 
 [features]
 # If not enabled, the dispute coordinator will do nothing.
diff --git a/polkadot/node/core/parachains-inherent/Cargo.toml b/polkadot/node/core/parachains-inherent/Cargo.toml
index b1cd5e971b008ab0048c7b81ad5b97df5d61e5b1..264b8da2b44d3d25903cc61edfffbdd20c960885 100644
--- a/polkadot/node/core/parachains-inherent/Cargo.toml
+++ b/polkadot/node/core/parachains-inherent/Cargo.toml
@@ -12,13 +12,13 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+async-trait = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-async-trait = { workspace = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
+thiserror = { workspace = true }
diff --git a/polkadot/node/core/prospective-parachains/Cargo.toml b/polkadot/node/core/prospective-parachains/Cargo.toml
index ced6c30c64b6b6018d107d06f7b3b473890771ee..0d0ede8d1d9bf4dd588be92893d26062617dfeb2 100644
--- a/polkadot/node/core/prospective-parachains/Cargo.toml
+++ b/polkadot/node/core/prospective-parachains/Cargo.toml
@@ -12,21 +12,21 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+fatality = { workspace = true }
 futures = { workspace = true }
 gum = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-fatality = { workspace = true }
 
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
-polkadot-primitives-test-helpers = { workspace = true }
 polkadot-primitives = { workspace = true, features = ["test"] }
-sp-tracing = { workspace = true }
-sp-core = { workspace = true, default-features = true }
+polkadot-primitives-test-helpers = { workspace = true }
 rand = { workspace = true }
 rstest = { workspace = true }
+sp-core = { workspace = true, default-features = true }
+sp-tracing = { workspace = true }
diff --git a/polkadot/node/core/provisioner/Cargo.toml b/polkadot/node/core/provisioner/Cargo.toml
index 26dca1adbc794088854e66d758e710ff72179f71..a3880d5a0f136eb9bd8fa30ffcc29e2baba6d081 100644
--- a/polkadot/node/core/provisioner/Cargo.toml
+++ b/polkadot/node/core/provisioner/Cargo.toml
@@ -13,22 +13,22 @@ workspace = true
 
 [dependencies]
 bitvec = { features = ["alloc"], workspace = true }
+fatality = { workspace = true }
 futures = { workspace = true }
+futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
-futures-timer = { workspace = true }
-fatality = { workspace = true }
+polkadot-primitives = { workspace = true, default-features = true }
 schnellru = { workspace = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-sp-application-crypto = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
-polkadot-primitives-test-helpers = { workspace = true }
 polkadot-primitives = { workspace = true, features = ["test"] }
+polkadot-primitives-test-helpers = { workspace = true }
+sp-application-crypto = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
 
 rstest = { workspace = true }
diff --git a/polkadot/node/core/pvf-checker/Cargo.toml b/polkadot/node/core/pvf-checker/Cargo.toml
index cb7e3eadcf0a0f8368c40757bcef38aba1ce3c84..fac5f85b6b565cb24b95a9ec1e09dfa511a00d74 100644
--- a/polkadot/node/core/pvf-checker/Cargo.toml
+++ b/polkadot/node/core/pvf-checker/Cargo.toml
@@ -13,23 +13,23 @@ workspace = true
 
 [dependencies]
 futures = { workspace = true }
-thiserror = { workspace = true }
 gum = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 sp-keystore = { workspace = true, default-features = true }
 
 [dev-dependencies]
-sp-core = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
+futures-timer = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-primitives-test-helpers = { workspace = true }
+sc-keystore = { workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
-futures-timer = { workspace = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
diff --git a/polkadot/node/core/pvf/Cargo.toml b/polkadot/node/core/pvf/Cargo.toml
index 1b2a16ae8b55544d06eb0a921fb71b98c3f5b605..f47f7b734285401ab814d82a143c4863000f5517 100644
--- a/polkadot/node/core/pvf/Cargo.toml
+++ b/polkadot/node/core/pvf/Cargo.toml
@@ -23,28 +23,28 @@ is_executable = { optional = true, workspace = true }
 pin-project = { workspace = true }
 rand = { workspace = true, default-features = true }
 slotmap = { workspace = true }
+strum = { features = ["derive"], workspace = true, default-features = true }
 tempfile = { workspace = true }
 thiserror = { workspace = true }
 tokio = { features = ["fs", "process"], workspace = true, default-features = true }
-strum = { features = ["derive"], workspace = true, default-features = true }
 
 codec = { features = [
 	"derive",
 ], workspace = true }
 
-polkadot-parachain-primitives = { workspace = true, default-features = true }
 polkadot-core-primitives = { workspace = true, default-features = true }
 polkadot-node-core-pvf-common = { workspace = true, default-features = true }
 polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
+polkadot-parachain-primitives = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
 
+polkadot-node-core-pvf-execute-worker = { optional = true, workspace = true, default-features = true }
+polkadot-node-core-pvf-prepare-worker = { optional = true, workspace = true, default-features = true }
 sc-tracing = { workspace = true }
 sp-core = { workspace = true, default-features = true }
 sp-maybe-compressed-blob = { optional = true, workspace = true, default-features = true }
-polkadot-node-core-pvf-prepare-worker = { optional = true, workspace = true, default-features = true }
-polkadot-node-core-pvf-execute-worker = { optional = true, workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
diff --git a/polkadot/node/core/pvf/execute-worker/Cargo.toml b/polkadot/node/core/pvf/execute-worker/Cargo.toml
index 8327cf8058cd05f9a24eca907faa740f889c86eb..4df425dfd199bb376f8a8fd600c927069d986bcb 100644
--- a/polkadot/node/core/pvf/execute-worker/Cargo.toml
+++ b/polkadot/node/core/pvf/execute-worker/Cargo.toml
@@ -12,11 +12,11 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+cfg-if = { workspace = true }
 cpu-time = { workspace = true }
 gum = { workspace = true, default-features = true }
-cfg-if = { workspace = true }
-nix = { features = ["process", "resource", "sched"], workspace = true }
 libc = { workspace = true }
+nix = { features = ["process", "resource", "sched"], workspace = true }
 
 codec = { features = ["derive"], workspace = true }
 
diff --git a/polkadot/node/core/pvf/prepare-worker/Cargo.toml b/polkadot/node/core/pvf/prepare-worker/Cargo.toml
index 9dc800a8ef5628cfc61984574de687e0c656cba1..aa551c196c37d872a5d9d6ca9486a3224d2baeb2 100644
--- a/polkadot/node/core/pvf/prepare-worker/Cargo.toml
+++ b/polkadot/node/core/pvf/prepare-worker/Cargo.toml
@@ -16,11 +16,11 @@ blake3 = { workspace = true }
 cfg-if = { workspace = true }
 gum = { workspace = true, default-features = true }
 libc = { workspace = true }
+nix = { features = ["process", "resource", "sched"], workspace = true }
 rayon = { workspace = true }
-tracking-allocator = { workspace = true, default-features = true }
 tikv-jemalloc-ctl = { optional = true, workspace = true }
 tikv-jemallocator = { optional = true, workspace = true }
-nix = { features = ["process", "resource", "sched"], workspace = true }
+tracking-allocator = { workspace = true, default-features = true }
 
 codec = { features = ["derive"], workspace = true }
 
diff --git a/polkadot/node/core/runtime-api/Cargo.toml b/polkadot/node/core/runtime-api/Cargo.toml
index 15cbf4665d067f105a28978cf2e43a99f871c9c7..65c92dc5c07046fa55aeffad8d4cccb8b5782ede 100644
--- a/polkadot/node/core/runtime-api/Cargo.toml
+++ b/polkadot/node/core/runtime-api/Cargo.toml
@@ -18,17 +18,17 @@ schnellru = { workspace = true }
 
 sp-consensus-babe = { workspace = true, default-features = true }
 
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-types = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
 [dev-dependencies]
-sp-api = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
 async-trait = { workspace = true }
 futures = { features = ["thread-pool"], workspace = true }
-polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-primitives-test-helpers = { workspace = true }
+sp-api = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
diff --git a/polkadot/node/gum/Cargo.toml b/polkadot/node/gum/Cargo.toml
index 84875ea121b670ee15c863f9fe734551f374c441..f4c22dd7595e01ee0375e83e8e68829f7db463a3 100644
--- a/polkadot/node/gum/Cargo.toml
+++ b/polkadot/node/gum/Cargo.toml
@@ -13,6 +13,6 @@ workspace = true
 
 [dependencies]
 coarsetime = { workspace = true }
-tracing = { workspace = true, default-features = true }
 gum-proc-macro = { workspace = true, default-features = true }
 polkadot-primitives = { features = ["std"], workspace = true, default-features = true }
+tracing = { workspace = true, default-features = true }
diff --git a/polkadot/node/gum/proc-macro/Cargo.toml b/polkadot/node/gum/proc-macro/Cargo.toml
index b4a3401b15e4ed6b578eb5110e7038cb0bcc9dda..0b69d8b67cf194ddf91890797415369538307575 100644
--- a/polkadot/node/gum/proc-macro/Cargo.toml
+++ b/polkadot/node/gum/proc-macro/Cargo.toml
@@ -18,11 +18,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-syn = { features = ["extra-traits", "full"], workspace = true }
-quote = { workspace = true }
-proc-macro2 = { workspace = true }
-proc-macro-crate = { workspace = true }
 expander = { workspace = true }
+proc-macro-crate = { workspace = true }
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
+syn = { features = ["extra-traits", "full"], workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
diff --git a/polkadot/node/malus/Cargo.toml b/polkadot/node/malus/Cargo.toml
index 49434606a61c8dff08a7c075c06c998cc8395a5b..84a58f382e20504bfa0b56835fb72243af5ae4bd 100644
--- a/polkadot/node/malus/Cargo.toml
+++ b/polkadot/node/malus/Cargo.toml
@@ -29,27 +29,27 @@ path = "../../src/bin/prepare-worker.rs"
 doc = false
 
 [dependencies]
-polkadot-cli = { features = ["malus", "rococo-native", "westend-native"], workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
-polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-node-subsystem-types = { workspace = true, default-features = true }
-polkadot-node-core-dispute-coordinator = { workspace = true, default-features = true }
-polkadot-node-core-candidate-validation = { workspace = true, default-features = true }
-polkadot-node-core-backing = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
-polkadot-node-network-protocol = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
-color-eyre = { workspace = true }
 assert_matches = { workspace = true }
 async-trait = { workspace = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 clap = { features = ["derive"], workspace = true }
+color-eyre = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
+polkadot-cli = { features = ["malus", "rococo-native", "westend-native"], workspace = true, default-features = true }
 polkadot-erasure-coding = { workspace = true, default-features = true }
+polkadot-node-core-backing = { workspace = true, default-features = true }
+polkadot-node-core-candidate-validation = { workspace = true, default-features = true }
+polkadot-node-core-dispute-coordinator = { workspace = true, default-features = true }
+polkadot-node-network-protocol = { workspace = true, default-features = true }
+polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem = { workspace = true, default-features = true }
+polkadot-node-subsystem-types = { workspace = true, default-features = true }
+polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
 
 # Required for worker binaries to build.
 polkadot-node-core-pvf-common = { workspace = true, default-features = true }
@@ -57,9 +57,9 @@ polkadot-node-core-pvf-execute-worker = { workspace = true, default-features = t
 polkadot-node-core-pvf-prepare-worker = { workspace = true, default-features = true }
 
 [dev-dependencies]
+futures = { features = ["thread-pool"], workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
 sp-core = { workspace = true, default-features = true }
-futures = { features = ["thread-pool"], workspace = true }
 
 [build-dependencies]
 substrate-build-script-utils = { workspace = true, default-features = true }
diff --git a/polkadot/node/metrics/Cargo.toml b/polkadot/node/metrics/Cargo.toml
index 05344993a75e7940a50bfb17451f3bda7eb9dc06..454337cb63f874f74de92698f7a96804f10693c3 100644
--- a/polkadot/node/metrics/Cargo.toml
+++ b/polkadot/node/metrics/Cargo.toml
@@ -18,28 +18,28 @@ gum = { workspace = true, default-features = true }
 
 metered = { features = ["futures_channel"], workspace = true }
 # Both `sc-service` and `sc-cli` are required by runtime metrics `logger_hook()`.
-sc-service = { workspace = true, default-features = true }
 sc-cli = { workspace = true, default-features = true }
+sc-service = { workspace = true, default-features = true }
 
-prometheus-endpoint = { workspace = true, default-features = true }
-sc-tracing = { workspace = true, default-features = true }
-codec = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 bs58 = { features = ["alloc"], workspace = true, default-features = true }
+codec = { workspace = true, default-features = true }
 log = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
+prometheus-endpoint = { workspace = true, default-features = true }
+sc-tracing = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_cmd = { workspace = true }
-tempfile = { workspace = true }
-hyper-util = { features = ["client-legacy", "tokio"], workspace = true }
-hyper = { workspace = true }
 http-body-util = { workspace = true }
-tokio = { workspace = true, default-features = true }
+hyper = { workspace = true }
+hyper-util = { features = ["client-legacy", "tokio"], workspace = true }
 polkadot-test-service = { features = ["runtime-metrics"], workspace = true }
-substrate-test-utils = { workspace = true }
+prometheus-parse = { workspace = true }
 sc-service = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
-prometheus-parse = { workspace = true }
+substrate-test-utils = { workspace = true }
+tempfile = { workspace = true }
+tokio = { workspace = true, default-features = true }
 
 [features]
 default = []
diff --git a/polkadot/node/network/approval-distribution/Cargo.toml b/polkadot/node/network/approval-distribution/Cargo.toml
index abf345552f891eb4d8be1fe8f1dbc9a68860866f..d9d3fd8635a62477034a103cb5c9fe8db6b130c8 100644
--- a/polkadot/node/network/approval-distribution/Cargo.toml
+++ b/polkadot/node/network/approval-distribution/Cargo.toml
@@ -12,6 +12,7 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+itertools = { workspace = true }
 polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
@@ -19,12 +20,11 @@ polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
-itertools = { workspace = true }
 
+bitvec = { features = ["alloc"], workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
-bitvec = { features = ["alloc"], workspace = true }
 
 [dev-dependencies]
 sc-keystore = { workspace = true }
@@ -38,7 +38,7 @@ polkadot-primitives-test-helpers = { workspace = true }
 assert_matches = { workspace = true }
 schnorrkel = { workspace = true }
 # rand_core should match schnorrkel
-rand_core = { workspace = true }
+log = { workspace = true, default-features = true }
 rand_chacha = { workspace = true, default-features = true }
+rand_core = { workspace = true }
 sp-tracing = { workspace = true }
-log = { workspace = true, default-features = true }
diff --git a/polkadot/node/network/availability-distribution/Cargo.toml b/polkadot/node/network/availability-distribution/Cargo.toml
index e87103d99f7283f1eae452199b09217083358bf7..7de8cb1915997c2c8f58394fc64b726e3cff5b8a 100644
--- a/polkadot/node/network/availability-distribution/Cargo.toml
+++ b/polkadot/node/network/availability-distribution/Cargo.toml
@@ -12,35 +12,35 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+codec = { features = ["std"], workspace = true, default-features = true }
+derive_more = { workspace = true, default-features = true }
+fatality = { workspace = true }
 futures = { workspace = true }
 gum = { workspace = true, default-features = true }
-codec = { features = ["std"], workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-erasure-coding = { workspace = true, default-features = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
+polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
+rand = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
+schnellru = { workspace = true }
 sp-core = { features = ["std"], workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-rand = { workspace = true, default-features = true }
-derive_more = { workspace = true, default-features = true }
-schnellru = { workspace = true }
-fatality = { workspace = true }
 
 [dev-dependencies]
+assert_matches = { workspace = true }
+futures-timer = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
+polkadot-primitives-test-helpers = { workspace = true }
+polkadot-subsystem-bench = { workspace = true }
+rstest = { workspace = true }
+sc-network = { workspace = true, default-features = true }
 sp-core = { features = ["std"], workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
-futures-timer = { workspace = true }
-assert_matches = { workspace = true }
-polkadot-primitives-test-helpers = { workspace = true }
-rstest = { workspace = true }
-polkadot-subsystem-bench = { workspace = true }
 
 
 [[bench]]
diff --git a/polkadot/node/network/availability-recovery/Cargo.toml b/polkadot/node/network/availability-recovery/Cargo.toml
index be4323e74f02cdd536d2b71696b5996123e5790a..8d4e6893b0a56e5e0c7d970c2daaebb57c9ef7fe 100644
--- a/polkadot/node/network/availability-recovery/Cargo.toml
+++ b/polkadot/node/network/availability-recovery/Cargo.toml
@@ -12,35 +12,35 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+async-trait = { workspace = true }
+fatality = { workspace = true }
 futures = { workspace = true }
-tokio = { workspace = true, default-features = true }
-schnellru = { workspace = true }
+gum = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
-fatality = { workspace = true }
+schnellru = { workspace = true }
 thiserror = { workspace = true }
-async-trait = { workspace = true }
-gum = { workspace = true, default-features = true }
+tokio = { workspace = true, default-features = true }
 
+codec = { features = ["derive"], workspace = true }
 polkadot-erasure-coding = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
+polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-node-network-protocol = { workspace = true, default-features = true }
-codec = { features = ["derive"], workspace = true }
+polkadot-primitives = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
 futures-timer = { workspace = true }
-rstest = { workspace = true }
 log = { workspace = true, default-features = true }
+rstest = { workspace = true }
 
-sp-tracing = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
+sp-application-crypto = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 
 polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-primitives-test-helpers = { workspace = true }
diff --git a/polkadot/node/network/bitfield-distribution/Cargo.toml b/polkadot/node/network/bitfield-distribution/Cargo.toml
index 2ff30489b6c1ad25b7ddb6f01d9ea2f03ba0c181..74a205276906ecb21b2c73b0017059613f704533 100644
--- a/polkadot/node/network/bitfield-distribution/Cargo.toml
+++ b/polkadot/node/network/bitfield-distribution/Cargo.toml
@@ -16,21 +16,21 @@ always-assert = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
+polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-node-network-protocol = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
 
 [dev-dependencies]
-polkadot-node-subsystem-test-helpers = { workspace = true }
+assert_matches = { workspace = true }
 bitvec = { features = ["alloc"], workspace = true }
-sp-core = { workspace = true, default-features = true }
+maplit = { workspace = true }
+polkadot-node-subsystem-test-helpers = { workspace = true }
+rand_chacha = { workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
 sp-authority-discovery = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
-maplit = { workspace = true }
+sp-keystore = { workspace = true, default-features = true }
 sp-tracing = { workspace = true }
-assert_matches = { workspace = true }
-rand_chacha = { workspace = true, default-features = true }
diff --git a/polkadot/node/network/bridge/Cargo.toml b/polkadot/node/network/bridge/Cargo.toml
index c4b46c1dc001b031cb2ce76a16d7141afc99abcd..cdc1bc3f6c1bcd8b05d4c9f3f4c51b577721a2a2 100644
--- a/polkadot/node/network/bridge/Cargo.toml
+++ b/polkadot/node/network/bridge/Cargo.toml
@@ -14,26 +14,26 @@ workspace = true
 [dependencies]
 always-assert = { workspace = true }
 async-trait = { workspace = true }
+bytes = { workspace = true, default-features = true }
+codec = { features = ["derive"], workspace = true }
+fatality = { workspace = true }
 futures = { workspace = true }
 gum = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
-codec = { features = ["derive"], workspace = true }
-sc-network = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
+parking_lot = { workspace = true, default-features = true }
 polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
-parking_lot = { workspace = true, default-features = true }
-bytes = { workspace = true, default-features = true }
-fatality = { workspace = true }
+polkadot-primitives = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
+futures-timer = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-primitives-test-helpers = { workspace = true }
 sp-core = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
-futures-timer = { workspace = true }
-polkadot-primitives-test-helpers = { workspace = true }
diff --git a/polkadot/node/network/collator-protocol/Cargo.toml b/polkadot/node/network/collator-protocol/Cargo.toml
index a51d24c70807ff94dcf5632bca4915496a62474e..a02b281b6fc42a1ec2c4c4c88c613af5da87077f 100644
--- a/polkadot/node/network/collator-protocol/Cargo.toml
+++ b/polkadot/node/network/collator-protocol/Cargo.toml
@@ -19,28 +19,28 @@ gum = { workspace = true, default-features = true }
 schnellru.workspace = true
 
 sp-core = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 
-polkadot-primitives = { workspace = true, default-features = true }
+fatality = { workspace = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
-polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
-fatality = { workspace = true }
+polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 thiserror = { workspace = true }
 tokio-util = { workspace = true }
 
 [dev-dependencies]
-sp-tracing = { workspace = true }
 assert_matches = { workspace = true }
 rstest = { workspace = true }
+sp-tracing = { workspace = true }
 
-sp-core = { features = ["std"], workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
+codec = { features = ["std"], workspace = true, default-features = true }
 sc-keystore = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
-codec = { features = ["std"], workspace = true, default-features = true }
+sp-core = { features = ["std"], workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 
 polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-primitives-test-helpers = { workspace = true }
diff --git a/polkadot/node/network/dispute-distribution/Cargo.toml b/polkadot/node/network/dispute-distribution/Cargo.toml
index 4f2f9ccadf8b64edb5b4d0fca623a36cc95142c0..079a37ca0aff0afd5623874edf9269b0f8332ba6 100644
--- a/polkadot/node/network/dispute-distribution/Cargo.toml
+++ b/polkadot/node/network/dispute-distribution/Cargo.toml
@@ -12,32 +12,32 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+codec = { features = ["std"], workspace = true, default-features = true }
+derive_more = { workspace = true, default-features = true }
+fatality = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
-derive_more = { workspace = true, default-features = true }
-codec = { features = ["std"], workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
+indexmap = { workspace = true }
 polkadot-erasure-coding = { workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
-polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem = { workspace = true, default-features = true }
+polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
+schnellru = { workspace = true }
 sp-application-crypto = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-fatality = { workspace = true }
-schnellru = { workspace = true }
-indexmap = { workspace = true }
 
 [dev-dependencies]
+assert_matches = { workspace = true }
 async-channel = { workspace = true }
 async-trait = { workspace = true }
+futures-timer = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
+polkadot-primitives-test-helpers = { workspace = true }
+sc-keystore = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
-futures-timer = { workspace = true }
-assert_matches = { workspace = true }
-polkadot-primitives-test-helpers = { workspace = true }
diff --git a/polkadot/node/network/gossip-support/Cargo.toml b/polkadot/node/network/gossip-support/Cargo.toml
index 7d17ea45eab9d6b1a003809b9a4f4384784e1a35..1ba556fc46b0479d0fb094cb96db909e9c444ac2 100644
--- a/polkadot/node/network/gossip-support/Cargo.toml
+++ b/polkadot/node/network/gossip-support/Cargo.toml
@@ -12,12 +12,12 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+sc-network = { workspace = true, default-features = true }
+sc-network-common = { workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
-sc-network-common = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
 
 polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
@@ -26,15 +26,15 @@ polkadot-primitives = { workspace = true, default-features = true }
 
 futures = { workspace = true }
 futures-timer = { workspace = true }
+gum = { workspace = true, default-features = true }
 rand = { workspace = true }
 rand_chacha = { workspace = true }
-gum = { workspace = true, default-features = true }
 
 [dev-dependencies]
-sp-keyring = { workspace = true, default-features = true }
+sp-authority-discovery = { workspace = true, default-features = true }
 sp-consensus-babe = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-sp-authority-discovery = { workspace = true, default-features = true }
 
 polkadot-node-subsystem-test-helpers = { workspace = true }
 
diff --git a/polkadot/node/network/protocol/Cargo.toml b/polkadot/node/network/protocol/Cargo.toml
index 0bcf224332bc6711a6e831138454c883436f68ad..83a24959f60a96ed1791739a8f9b1414d91474c1 100644
--- a/polkadot/node/network/protocol/Cargo.toml
+++ b/polkadot/node/network/protocol/Cargo.toml
@@ -14,22 +14,22 @@ workspace = true
 [dependencies]
 async-channel = { workspace = true }
 async-trait = { workspace = true }
+bitvec = { workspace = true, default-features = true }
+codec = { features = ["derive"], workspace = true }
+derive_more = { workspace = true, default-features = true }
+fatality = { workspace = true }
+futures = { workspace = true }
+gum = { workspace = true, default-features = true }
 hex = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
-codec = { features = ["derive"], workspace = true }
+polkadot-primitives = { workspace = true, default-features = true }
+rand = { workspace = true, default-features = true }
+sc-authority-discovery = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
-sc-authority-discovery = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 strum = { features = ["derive"], workspace = true, default-features = true }
-futures = { workspace = true }
 thiserror = { workspace = true }
-fatality = { workspace = true }
-rand = { workspace = true, default-features = true }
-derive_more = { workspace = true, default-features = true }
-gum = { workspace = true, default-features = true }
-bitvec = { workspace = true, default-features = true }
 
 [dev-dependencies]
 rand_chacha = { workspace = true, default-features = true }
diff --git a/polkadot/node/network/statement-distribution/Cargo.toml b/polkadot/node/network/statement-distribution/Cargo.toml
index d737c7bf89683cf273e9db2c286761185296ef88..8bd058b8c849c2e14d55366587f94021844669ce 100644
--- a/polkadot/node/network/statement-distribution/Cargo.toml
+++ b/polkadot/node/network/statement-distribution/Cargo.toml
@@ -12,41 +12,41 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+arrayvec = { workspace = true }
+bitvec = { workspace = true, default-features = true }
+codec = { features = ["derive"], workspace = true }
+fatality = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 gum = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
-sp-staking = { workspace = true }
-sp-keystore = { workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
+indexmap = { workspace = true }
+polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-node-network-protocol = { workspace = true, default-features = true }
-arrayvec = { workspace = true }
-indexmap = { workspace = true }
-codec = { features = ["derive"], workspace = true }
+polkadot-primitives = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-staking = { workspace = true }
 thiserror = { workspace = true }
-fatality = { workspace = true }
-bitvec = { workspace = true, default-features = true }
 
 [dev-dependencies]
-async-channel = { workspace = true }
 assert_matches = { workspace = true }
-polkadot-node-subsystem-test-helpers = { workspace = true }
-sp-authority-discovery = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
+async-channel = { workspace = true }
 futures-timer = { workspace = true }
+polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-primitives = { workspace = true, features = ["test"] }
 polkadot-primitives-test-helpers = { workspace = true }
-rand_chacha = { workspace = true, default-features = true }
 polkadot-subsystem-bench = { workspace = true }
+rand_chacha = { workspace = true, default-features = true }
 rstest = { workspace = true }
+sc-keystore = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
+sp-application-crypto = { workspace = true, default-features = true }
+sp-authority-discovery = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 
 [[bench]]
 name = "statement-distribution-regression-bench"
diff --git a/polkadot/node/overseer/Cargo.toml b/polkadot/node/overseer/Cargo.toml
index 62634c1da0900649a4db862114f774a373134f25..fd7f1e039247ed1ac3629903bdb79e89b79eea93 100644
--- a/polkadot/node/overseer/Cargo.toml
+++ b/polkadot/node/overseer/Cargo.toml
@@ -12,30 +12,30 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-sc-client-api = { workspace = true, default-features = true }
-sp-api = { workspace = true, default-features = true }
+async-trait = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
+gum = { workspace = true, default-features = true }
+orchestra = { features = ["futures_channel"], workspace = true }
 parking_lot = { workspace = true, default-features = true }
+polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem-types = { workspace = true, default-features = true }
-polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
-orchestra = { features = ["futures_channel"], workspace = true }
-gum = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
+sp-api = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-async-trait = { workspace = true }
 tikv-jemalloc-ctl = { optional = true, workspace = true }
 
 [dev-dependencies]
-metered = { features = ["futures_channel"], workspace = true }
-sp-core = { workspace = true, default-features = true }
-futures = { features = ["thread-pool"], workspace = true }
-femme = { workspace = true }
 assert_matches = { workspace = true }
-polkadot-primitives-test-helpers = { workspace = true }
+femme = { workspace = true }
+futures = { features = ["thread-pool"], workspace = true }
+metered = { features = ["futures_channel"], workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
+polkadot-primitives-test-helpers = { workspace = true }
+sp-core = { workspace = true, default-features = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 tikv-jemalloc-ctl = "0.5.0"
diff --git a/polkadot/node/primitives/Cargo.toml b/polkadot/node/primitives/Cargo.toml
index 50ee3a80ddb8cfa704044d7d0f4d24dbdfc509bf..d138b77dea8fb3d3f2848703fa7639c4f79cec03 100644
--- a/polkadot/node/primitives/Cargo.toml
+++ b/polkadot/node/primitives/Cargo.toml
@@ -12,24 +12,24 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+bitvec = { features = ["alloc"], workspace = true }
 bounded-vec = { workspace = true }
+codec = { features = ["derive"], workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
+polkadot-parachain-primitives = { workspace = true }
 polkadot-primitives = { workspace = true, default-features = true }
-codec = { features = ["derive"], workspace = true }
-sp-core = { workspace = true, default-features = true }
+sc-keystore = { workspace = true }
+schnorrkel = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
 sp-consensus-babe = { workspace = true, default-features = true }
 sp-consensus-slots = { workspace = true }
+sp-core = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-maybe-compressed-blob = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-polkadot-parachain-primitives = { workspace = true }
-schnorrkel = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-bitvec = { features = ["alloc"], workspace = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-sc-keystore = { workspace = true }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 zstd = { version = "0.12.4", default-features = false }
diff --git a/polkadot/node/service/Cargo.toml b/polkadot/node/service/Cargo.toml
index c1e06dd830b5686ca7b5baf0a48845f9934346be..122040a9b20794566d90a177baf790ea595fbb91 100644
--- a/polkadot/node/service/Cargo.toml
+++ b/polkadot/node/service/Cargo.toml
@@ -14,98 +14,98 @@ workspace = true
 
 [dependencies]
 # Substrate Client
-sc-authority-discovery = { workspace = true, default-features = true }
-sc-consensus-babe = { workspace = true, default-features = true }
-sc-consensus-beefy = { workspace = true, default-features = true }
-sc-consensus-grandpa = { workspace = true, default-features = true }
 mmr-gadget = { workspace = true, default-features = true }
-sp-mmr-primitives = { workspace = true, default-features = true }
-sp-genesis-builder = { workspace = true, default-features = true }
+sc-authority-discovery = { workspace = true, default-features = true }
+sc-basic-authorship = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
+sc-consensus-babe = { workspace = true, default-features = true }
+sc-consensus-beefy = { workspace = true, default-features = true }
+sc-consensus-grandpa = { workspace = true, default-features = true }
 sc-consensus-slots = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
+sc-keystore = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
-sc-transaction-pool = { workspace = true, default-features = true }
-sc-transaction-pool-api = { workspace = true, default-features = true }
-sc-sync-state-rpc = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
-sc-basic-authorship = { workspace = true, default-features = true }
 sc-offchain = { workspace = true, default-features = true }
-sc-sysinfo = { workspace = true, default-features = true }
 sc-service = { workspace = true }
+sc-sync-state-rpc = { workspace = true, default-features = true }
+sc-sysinfo = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
+sc-transaction-pool = { workspace = true, default-features = true }
+sc-transaction-pool-api = { workspace = true, default-features = true }
+sp-genesis-builder = { workspace = true, default-features = true }
+sp-mmr-primitives = { workspace = true, default-features = true }
 
 # Substrate Primitives
+pallet-transaction-payment = { workspace = true, default-features = true }
+sp-api = { workspace = true, default-features = true }
 sp-authority-discovery = { workspace = true, default-features = true }
+sp-block-builder = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
+sp-consensus-babe = { workspace = true, default-features = true }
 sp-consensus-beefy = { workspace = true, default-features = true }
 sp-consensus-grandpa = { workspace = true, default-features = true }
-sp-inherents = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-api = { workspace = true, default-features = true }
-sp-block-builder = { workspace = true, default-features = true }
-sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+sp-inherents = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 sp-offchain = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-session = { workspace = true, default-features = true }
-sp-transaction-pool = { workspace = true, default-features = true }
-pallet-transaction-payment = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
-sp-weights = { workspace = true, default-features = true }
+sp-transaction-pool = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
+sp-weights = { workspace = true, default-features = true }
 
 # Substrate Pallets
-pallet-transaction-payment-rpc-runtime-api = { workspace = true, default-features = true }
 frame-metadata-hash-extension = { optional = true, workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
+pallet-transaction-payment-rpc-runtime-api = { workspace = true, default-features = true }
 
 # Substrate Other
+frame-benchmarking = { workspace = true, default-features = true }
+frame-benchmarking-cli = { workspace = true, default-features = true }
 frame-system-rpc-runtime-api = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
-frame-benchmarking-cli = { workspace = true, default-features = true }
-frame-benchmarking = { workspace = true, default-features = true }
 
 # External Crates
 async-trait = { workspace = true }
+codec = { workspace = true, default-features = true }
 futures = { workspace = true }
-is_executable = { workspace = true }
 gum = { workspace = true, default-features = true }
-log = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-thiserror = { workspace = true }
+is_executable = { workspace = true }
 kvdb = { workspace = true }
 kvdb-rocksdb = { optional = true, workspace = true }
+log = { workspace = true, default-features = true }
 parity-db = { optional = true, workspace = true }
-codec = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 # Polkadot
 polkadot-core-primitives = { workspace = true, default-features = true }
 polkadot-node-core-parachains-inherent = { workspace = true, default-features = true }
-polkadot-overseer = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
+polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
-polkadot-rpc = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
-polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-node-subsystem-types = { workspace = true, default-features = true }
+polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-overseer = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
+polkadot-rpc = { workspace = true, default-features = true }
 polkadot-runtime-parachains = { workspace = true, default-features = true }
-polkadot-node-network-protocol = { workspace = true, default-features = true }
 
 # Polkadot Runtime Constants
 rococo-runtime-constants = { optional = true, workspace = true, default-features = true }
 westend-runtime-constants = { optional = true, workspace = true, default-features = true }
 
 # Polkadot Runtimes
-westend-runtime = { optional = true, workspace = true }
 rococo-runtime = { optional = true, workspace = true }
+westend-runtime = { optional = true, workspace = true }
 
 # Polkadot Subsystems
 polkadot-approval-distribution = { optional = true, workspace = true, default-features = true }
@@ -137,11 +137,11 @@ xcm = { workspace = true, default-features = true }
 xcm-runtime-apis = { workspace = true, default-features = true }
 
 [dev-dependencies]
-polkadot-test-client = { workspace = true }
+assert_matches = { workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-primitives-test-helpers = { workspace = true }
+polkadot-test-client = { workspace = true }
 sp-tracing = { workspace = true }
-assert_matches = { workspace = true }
 tempfile = { workspace = true }
 
 [features]
diff --git a/polkadot/node/subsystem-bench/Cargo.toml b/polkadot/node/subsystem-bench/Cargo.toml
index 8633818e775da0e4ea5213c3c5f6a436b535a664..e288ee2b78d3392309d6585efa9ec26fd508750a 100644
--- a/polkadot/node/subsystem-bench/Cargo.toml
+++ b/polkadot/node/subsystem-bench/Cargo.toml
@@ -21,79 +21,79 @@ doc = false
 
 
 [dependencies]
-tikv-jemallocator = { features = ["profiling", "unprefixed_malloc_on_supported_platforms"], workspace = true, optional = true }
-jemalloc_pprof = { workspace = true, optional = true }
-polkadot-service = { workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
-polkadot-node-subsystem-util = { workspace = true, default-features = true }
-polkadot-node-subsystem-types = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, features = ["test"] }
-polkadot-node-network-protocol = { workspace = true, default-features = true }
-polkadot-availability-recovery = { features = ["subsystem-benchmarks"], workspace = true, default-features = true }
-polkadot-availability-distribution = { workspace = true, default-features = true }
-polkadot-statement-distribution = { workspace = true, default-features = true }
-polkadot-node-core-av-store = { workspace = true, default-features = true }
-polkadot-node-core-chain-api = { workspace = true, default-features = true }
-polkadot-availability-bitfield-distribution = { workspace = true, default-features = true }
-color-eyre = { workspace = true }
-polkadot-overseer = { workspace = true, default-features = true }
-colored = { workspace = true }
 assert_matches = { workspace = true }
 async-trait = { workspace = true }
-sp-keystore = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
+bincode = { workspace = true }
 clap = { features = ["derive"], workspace = true }
+color-eyre = { workspace = true }
+colored = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
-bincode = { workspace = true }
-sha1 = { workspace = true }
-hex = { workspace = true, default-features = true }
 gum = { workspace = true, default-features = true }
-polkadot-erasure-coding = { workspace = true, default-features = true }
+hex = { workspace = true, default-features = true }
+jemalloc_pprof = { workspace = true, optional = true }
 log = { workspace = true, default-features = true }
-sp-tracing = { workspace = true }
+polkadot-availability-bitfield-distribution = { workspace = true, default-features = true }
+polkadot-availability-distribution = { workspace = true, default-features = true }
+polkadot-availability-recovery = { features = ["subsystem-benchmarks"], workspace = true, default-features = true }
+polkadot-erasure-coding = { workspace = true, default-features = true }
+polkadot-node-core-av-store = { workspace = true, default-features = true }
+polkadot-node-core-chain-api = { workspace = true, default-features = true }
+polkadot-node-network-protocol = { workspace = true, default-features = true }
+polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem = { workspace = true, default-features = true }
+polkadot-node-subsystem-types = { workspace = true, default-features = true }
+polkadot-node-subsystem-util = { workspace = true, default-features = true }
+polkadot-overseer = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, features = ["test"] }
+polkadot-service = { workspace = true, default-features = true }
+polkadot-statement-distribution = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
+sc-keystore = { workspace = true, default-features = true }
+sha1 = { workspace = true }
+sp-core = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-tracing = { workspace = true }
+tikv-jemallocator = { features = ["profiling", "unprefixed_malloc_on_supported_platforms"], workspace = true, optional = true }
 # `rand` only supports uniform distribution, we need normal distribution for latency.
-rand_distr = { workspace = true }
 bitvec = { workspace = true, default-features = true }
 kvdb-memorydb = { workspace = true }
+rand_distr = { workspace = true }
 
-codec = { features = ["derive", "std"], workspace = true, default-features = true }
-tokio = { features = ["parking_lot", "rt-multi-thread"], workspace = true, default-features = true }
 clap-num = { workspace = true }
+codec = { features = ["derive", "std"], workspace = true, default-features = true }
+itertools = { workspace = true }
+polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
-sp-keyring = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true, default-features = true }
+polkadot-primitives-test-helpers = { workspace = true }
+prometheus = { workspace = true }
+prometheus-endpoint = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
-polkadot-node-metrics = { workspace = true, default-features = true }
-itertools = { workspace = true }
-polkadot-primitives-test-helpers = { workspace = true }
-prometheus-endpoint = { workspace = true, default-features = true }
-prometheus = { workspace = true }
 serde = { workspace = true, default-features = true }
-serde_yaml = { workspace = true }
 serde_json = { workspace = true }
+serde_yaml = { workspace = true }
+sp-application-crypto = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+tokio = { features = ["parking_lot", "rt-multi-thread"], workspace = true, default-features = true }
 
+polkadot-approval-distribution = { workspace = true, default-features = true }
 polkadot-node-core-approval-voting = { workspace = true, default-features = true }
 polkadot-node-core-approval-voting-parallel = { workspace = true, default-features = true }
-polkadot-approval-distribution = { workspace = true, default-features = true }
 sp-consensus-babe = { workspace = true, default-features = true }
 sp-runtime = { workspace = true }
 sp-timestamp = { workspace = true, default-features = true }
 
 schnorrkel = { workspace = true }
 # rand_core should match schnorrkel
-rand_core = { workspace = true }
-rand_chacha = { workspace = true, default-features = true }
-paste = { workspace = true, default-features = true }
 orchestra = { features = ["futures_channel"], workspace = true }
+paste = { workspace = true, default-features = true }
 pyroscope = { workspace = true }
 pyroscope_pprofrs = { workspace = true }
+rand_chacha = { workspace = true, default-features = true }
+rand_core = { workspace = true }
 strum = { features = ["derive"], workspace = true, default-features = true }
 
 [features]
diff --git a/polkadot/node/subsystem-test-helpers/Cargo.toml b/polkadot/node/subsystem-test-helpers/Cargo.toml
index d3229291673c6da0b1ba12d6983c678ed2d5a343..4e660b15c1e29e817a1b8a12d1ce7e6e8f7cab90 100644
--- a/polkadot/node/subsystem-test-helpers/Cargo.toml
+++ b/polkadot/node/subsystem-test-helpers/Cargo.toml
@@ -14,16 +14,16 @@ workspace = true
 async-trait = { workspace = true }
 futures = { workspace = true }
 parking_lot = { workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-erasure-coding = { workspace = true, default-features = true }
+polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
 
 sc-client-api = { workspace = true, default-features = true }
+sc-keystore = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
+sp-application-crypto = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
diff --git a/polkadot/node/subsystem-types/Cargo.toml b/polkadot/node/subsystem-types/Cargo.toml
index 44bb7036d63da71c1c5c6fe19ddc1cf187e94042..6c88a4474137db8af2ee6cf4fa6e49c0de4c48e5 100644
--- a/polkadot/node/subsystem-types/Cargo.toml
+++ b/polkadot/node/subsystem-types/Cargo.toml
@@ -12,25 +12,25 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+async-trait = { workspace = true }
+bitvec = { features = ["alloc"], workspace = true }
 derive_more = { workspace = true, default-features = true }
 fatality = { workspace = true }
 futures = { workspace = true }
-polkadot-primitives = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
+orchestra = { features = ["futures_channel"], workspace = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
+polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 polkadot-statement-table = { workspace = true, default-features = true }
-orchestra = { features = ["futures_channel"], workspace = true }
+prometheus-endpoint = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
+sc-transaction-pool-api = { workspace = true, default-features = true }
+smallvec = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
+sp-authority-discovery = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus-babe = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-authority-discovery = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-sc-transaction-pool-api = { workspace = true, default-features = true }
-smallvec = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-async-trait = { workspace = true }
-bitvec = { features = ["alloc"], workspace = true }
diff --git a/polkadot/node/subsystem-util/Cargo.toml b/polkadot/node/subsystem-util/Cargo.toml
index 9c21fede1c475092620587acb6ae6ac8bdcafab1..0e6ebf61199723260b92a8c445719ddc8d363dd0 100644
--- a/polkadot/node/subsystem-util/Cargo.toml
+++ b/polkadot/node/subsystem-util/Cargo.toml
@@ -13,33 +13,33 @@ workspace = true
 
 [dependencies]
 async-trait = { workspace = true }
+codec = { features = ["derive"], workspace = true }
+derive_more = { workspace = true, default-features = true }
+fatality = { workspace = true }
 futures = { workspace = true }
 futures-channel = { workspace = true }
+gum = { workspace = true, default-features = true }
 itertools = { workspace = true }
-codec = { features = ["derive"], workspace = true }
 parking_lot = { workspace = true, default-features = true }
 pin-project = { workspace = true }
 rand = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-fatality = { workspace = true }
-gum = { workspace = true, default-features = true }
-derive_more = { workspace = true, default-features = true }
 schnellru = { workspace = true }
+thiserror = { workspace = true }
 
+metered = { features = ["futures_channel"], workspace = true }
 polkadot-erasure-coding = { workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
-polkadot-node-subsystem-types = { workspace = true, default-features = true }
 polkadot-node-metrics = { workspace = true, default-features = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem = { workspace = true, default-features = true }
+polkadot-node-subsystem-types = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
-metered = { features = ["futures_channel"], workspace = true }
+polkadot-primitives = { workspace = true, default-features = true }
 
-sp-core = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
 
 kvdb = { workspace = true }
 parity-db = { workspace = true }
@@ -47,9 +47,9 @@ parity-db = { workspace = true }
 [dev-dependencies]
 assert_matches = { workspace = true }
 futures = { features = ["thread-pool"], workspace = true }
+kvdb-memorydb = { workspace = true }
+kvdb-shared-tests = { workspace = true }
 log = { workspace = true, default-features = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-primitives-test-helpers = { workspace = true }
-kvdb-shared-tests = { workspace = true }
 tempfile = { workspace = true }
-kvdb-memorydb = { workspace = true }
diff --git a/polkadot/node/subsystem/Cargo.toml b/polkadot/node/subsystem/Cargo.toml
index 4f30d3ce9c097b5e5841a6318e70b8e7b3283d9d..8b4a26e33ee6eee012820e36a7d1c1b07ca9b8ca 100644
--- a/polkadot/node/subsystem/Cargo.toml
+++ b/polkadot/node/subsystem/Cargo.toml
@@ -12,5 +12,5 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-polkadot-overseer = { workspace = true, default-features = true }
 polkadot-node-subsystem-types = { workspace = true, default-features = true }
+polkadot-overseer = { workspace = true, default-features = true }
diff --git a/polkadot/node/test/client/Cargo.toml b/polkadot/node/test/client/Cargo.toml
index 587af659fbd2dfeb142c4f307ce71a92b0fae35b..13b14c0b92318fd46933e4bc5037d6b25a0bf00e 100644
--- a/polkadot/node/test/client/Cargo.toml
+++ b/polkadot/node/test/client/Cargo.toml
@@ -13,32 +13,32 @@ workspace = true
 codec = { features = ["derive"], workspace = true }
 
 # Polkadot dependencies
+polkadot-node-subsystem = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 polkadot-test-runtime = { workspace = true }
 polkadot-test-service = { workspace = true }
-polkadot-primitives = { workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
 
 # Substrate dependencies
-substrate-test-client = { workspace = true }
-sc-service = { workspace = true, default-features = true }
+frame-benchmarking = { workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-offchain = { workspace = true, default-features = true }
-sp-blockchain = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
-sp-inherents = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
+sc-service = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
-sp-timestamp = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-consensus-babe = { workspace = true, default-features = true }
-sp-state-machine = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-inherents = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-frame-benchmarking = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-state-machine = { workspace = true, default-features = true }
+sp-timestamp = { workspace = true, default-features = true }
+substrate-test-client = { workspace = true }
 
 [dev-dependencies]
-sp-keyring = { workspace = true, default-features = true }
 futures = { workspace = true }
+sp-keyring = { workspace = true, default-features = true }
 
 [features]
 runtime-benchmarks = [
diff --git a/polkadot/node/test/service/Cargo.toml b/polkadot/node/test/service/Cargo.toml
index 4ef9d88621fb4ee23044a56d7492aad9fa19d0a3..54db2a0ac942512eb79785b3d91ca1b2b2d22270 100644
--- a/polkadot/node/test/service/Cargo.toml
+++ b/polkadot/node/test/service/Cargo.toml
@@ -11,50 +11,50 @@ workspace = true
 
 [dependencies]
 futures = { workspace = true }
-hex = { workspace = true, default-features = true }
 gum = { workspace = true, default-features = true }
+hex = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
 tempfile = { workspace = true }
 tokio = { workspace = true, default-features = true }
 
 # Polkadot dependencies
+polkadot-node-primitives = { workspace = true, default-features = true }
+polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-overseer = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 polkadot-rpc = { workspace = true, default-features = true }
 polkadot-runtime-common = { workspace = true, default-features = true }
+polkadot-runtime-parachains = { workspace = true, default-features = true }
 polkadot-service = { workspace = true, default-features = true }
-polkadot-node-subsystem = { workspace = true, default-features = true }
-polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-test-runtime = { workspace = true }
 test-runtime-constants = { workspace = true, default-features = true }
-polkadot-runtime-parachains = { workspace = true, default-features = true }
 
 # Substrate dependencies
-sp-authority-discovery = { workspace = true, default-features = true }
-sc-authority-discovery = { workspace = true, default-features = true }
-sc-consensus-babe = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
-sc-consensus-grandpa = { workspace = true, default-features = true }
-sp-consensus-grandpa = { workspace = true, default-features = true }
-sp-inherents = { workspace = true, default-features = true }
-pallet-staking = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
+pallet-staking = { workspace = true, default-features = true }
 pallet-transaction-payment = { workspace = true, default-features = true }
+sc-authority-discovery = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true, default-features = true }
 sc-cli = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
+sc-consensus-babe = { workspace = true, default-features = true }
+sc-consensus-grandpa = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
+sc-service = { workspace = true }
 sc-tracing = { workspace = true, default-features = true }
 sc-transaction-pool = { workspace = true, default-features = true }
-sc-service = { workspace = true }
 sp-arithmetic = { workspace = true, default-features = true }
+sp-authority-discovery = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-consensus-babe = { workspace = true, default-features = true }
+sp-consensus-grandpa = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+sp-inherents = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
diff --git a/polkadot/node/zombienet-backchannel/Cargo.toml b/polkadot/node/zombienet-backchannel/Cargo.toml
index 56c49a1ec305e17e949c71104bd659bdb5c379a6..0d04012e28a8ad02bb5c78d031db0c8e16720e0d 100644
--- a/polkadot/node/zombienet-backchannel/Cargo.toml
+++ b/polkadot/node/zombienet-backchannel/Cargo.toml
@@ -12,13 +12,13 @@ license.workspace = true
 workspace = true
 
 [dependencies]
-tokio = { features = ["macros", "net", "rt-multi-thread", "sync"], workspace = true }
-url = { workspace = true }
-tokio-tungstenite = { workspace = true }
-futures-util = { workspace = true, default-features = true }
 codec = { features = ["derive"], workspace = true, default-features = true }
-reqwest = { features = ["rustls-tls"], workspace = true }
-thiserror = { workspace = true }
+futures-util = { workspace = true, default-features = true }
 gum = { workspace = true, default-features = true }
+reqwest = { features = ["rustls-tls"], workspace = true }
 serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
+thiserror = { workspace = true }
+tokio = { features = ["macros", "net", "rt-multi-thread", "sync"], workspace = true }
+tokio-tungstenite = { workspace = true }
+url = { workspace = true }
diff --git a/polkadot/parachain/Cargo.toml b/polkadot/parachain/Cargo.toml
index ea6c4423dc19e6b5747b381c28197ff6132ba218..0dd103d58b25ef393588695474f0f3145846961b 100644
--- a/polkadot/parachain/Cargo.toml
+++ b/polkadot/parachain/Cargo.toml
@@ -15,14 +15,14 @@ workspace = true
 # note: special care is taken to avoid inclusion of `sp-io` externals when compiling
 # this crate for WASM. This is critical to avoid forcing all parachain WASM into implementing
 # various unnecessary Substrate-specific endpoints.
+bounded-collections = { features = ["serde"], workspace = true }
 codec = { features = ["derive"], workspace = true }
+derive_more = { workspace = true, default-features = true }
+polkadot-core-primitives = { workspace = true }
 scale-info = { features = ["derive", "serde"], workspace = true }
-sp-runtime = { features = ["serde"], workspace = true }
 sp-core = { features = ["serde"], workspace = true }
+sp-runtime = { features = ["serde"], workspace = true }
 sp-weights = { workspace = true }
-polkadot-core-primitives = { workspace = true }
-derive_more = { workspace = true, default-features = true }
-bounded-collections = { features = ["serde"], workspace = true }
 
 # all optional crates.
 serde = { features = ["alloc", "derive"], workspace = true }
diff --git a/polkadot/parachain/test-parachains/Cargo.toml b/polkadot/parachain/test-parachains/Cargo.toml
index 9f35653f957f3ba8423c5a1e47ca08a05d6bf6c5..2a1e1722bff932d8d3a32fda9e4b9a7141026045 100644
--- a/polkadot/parachain/test-parachains/Cargo.toml
+++ b/polkadot/parachain/test-parachains/Cargo.toml
@@ -11,8 +11,8 @@ publish = false
 workspace = true
 
 [dependencies]
-tiny-keccak = { features = ["keccak"], workspace = true }
 codec = { features = ["derive"], workspace = true }
+tiny-keccak = { features = ["keccak"], workspace = true }
 
 test-parachain-adder = { workspace = true }
 test-parachain-halt = { workspace = true }
diff --git a/polkadot/parachain/test-parachains/adder/Cargo.toml b/polkadot/parachain/test-parachains/adder/Cargo.toml
index 7a150b75d5cdb28a82cdaf9cdeef3cb0c3a4582d..945b0e15690479fe89fb1e3ce4b2b4e129e91eff 100644
--- a/polkadot/parachain/test-parachains/adder/Cargo.toml
+++ b/polkadot/parachain/test-parachains/adder/Cargo.toml
@@ -12,10 +12,10 @@ publish = false
 workspace = true
 
 [dependencies]
-polkadot-parachain-primitives = { features = ["wasm-api"], workspace = true }
 codec = { features = ["derive"], workspace = true }
-tiny-keccak = { features = ["keccak"], workspace = true }
 dlmalloc = { features = ["global"], workspace = true }
+polkadot-parachain-primitives = { features = ["wasm-api"], workspace = true }
+tiny-keccak = { features = ["keccak"], workspace = true }
 
 # We need to make sure the global allocator is disabled until we have support of full substrate externalities
 sp-io = { features = ["disable_allocator"], workspace = true }
diff --git a/polkadot/parachain/test-parachains/adder/collator/Cargo.toml b/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
index 061378a76a82eb8edcf8823d7ee3d43d7d3fc7e9..20305dc07c3a5709e9b4626c89aa5b06398eb30d 100644
--- a/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
+++ b/polkadot/parachain/test-parachains/adder/collator/Cargo.toml
@@ -15,30 +15,30 @@ name = "adder-collator"
 path = "src/main.rs"
 
 [dependencies]
-codec = { features = ["derive"], workspace = true }
 clap = { features = ["derive"], workspace = true }
+codec = { features = ["derive"], workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 log = { workspace = true, default-features = true }
 
-test-parachain-adder = { workspace = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-cli = { workspace = true, default-features = true }
-polkadot-service = { features = ["rococo-native"], workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
+polkadot-service = { features = ["rococo-native"], workspace = true, default-features = true }
+test-parachain-adder = { workspace = true }
 
 sc-cli = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 
 [dev-dependencies]
+polkadot-node-core-pvf = { features = ["test-utils"], workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
 polkadot-test-service = { workspace = true }
-polkadot-node-core-pvf = { features = ["test-utils"], workspace = true, default-features = true }
 
-substrate-test-utils = { workspace = true }
 sc-service = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
+substrate-test-utils = { workspace = true }
 
 tokio = { features = ["macros"], workspace = true, default-features = true }
diff --git a/polkadot/parachain/test-parachains/halt/Cargo.toml b/polkadot/parachain/test-parachains/halt/Cargo.toml
index f8272f6ed19681adf3faa57dfac3c4f126db6839..ea8372ccd121fbe8e7b401143626feb01c794b3d 100644
--- a/polkadot/parachain/test-parachains/halt/Cargo.toml
+++ b/polkadot/parachain/test-parachains/halt/Cargo.toml
@@ -14,8 +14,8 @@ workspace = true
 [dependencies]
 
 [build-dependencies]
-substrate-wasm-builder = { workspace = true, default-features = true }
 rustversion = { workspace = true }
+substrate-wasm-builder = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/parachain/test-parachains/undying/Cargo.toml b/polkadot/parachain/test-parachains/undying/Cargo.toml
index 4b2e12ebf435422c713fd2319eee08d9fa45d8dc..43b5a3352434feff95274d4c5b0435829e390573 100644
--- a/polkadot/parachain/test-parachains/undying/Cargo.toml
+++ b/polkadot/parachain/test-parachains/undying/Cargo.toml
@@ -12,11 +12,11 @@ license.workspace = true
 workspace = true
 
 [dependencies]
-polkadot-parachain-primitives = { features = ["wasm-api"], workspace = true }
 codec = { features = ["derive"], workspace = true }
-tiny-keccak = { features = ["keccak"], workspace = true }
 dlmalloc = { features = ["global"], workspace = true }
 log = { workspace = true }
+polkadot-parachain-primitives = { features = ["wasm-api"], workspace = true }
+tiny-keccak = { features = ["keccak"], workspace = true }
 
 # We need to make sure the global allocator is disabled until we have support of full substrate externalities
 sp-io = { features = ["disable_allocator"], workspace = true }
diff --git a/polkadot/parachain/test-parachains/undying/collator/Cargo.toml b/polkadot/parachain/test-parachains/undying/collator/Cargo.toml
index 5760258c70ea5757f5fda90abbfe5a41e5ee0fb4..b964b4dc49ce5d4e18cdc33ba8907d043423d32c 100644
--- a/polkadot/parachain/test-parachains/undying/collator/Cargo.toml
+++ b/polkadot/parachain/test-parachains/undying/collator/Cargo.toml
@@ -15,30 +15,30 @@ name = "undying-collator"
 path = "src/main.rs"
 
 [dependencies]
-codec = { features = ["derive"], workspace = true }
 clap = { features = ["derive"], workspace = true }
+codec = { features = ["derive"], workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 log = { workspace = true, default-features = true }
 
-test-parachain-undying = { workspace = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-cli = { workspace = true, default-features = true }
-polkadot-service = { features = ["rococo-native"], workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
+polkadot-service = { features = ["rococo-native"], workspace = true, default-features = true }
+test-parachain-undying = { workspace = true }
 
 sc-cli = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 
 [dev-dependencies]
+polkadot-node-core-pvf = { features = ["test-utils"], workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
 polkadot-test-service = { workspace = true }
-polkadot-node-core-pvf = { features = ["test-utils"], workspace = true, default-features = true }
 
-substrate-test-utils = { workspace = true }
 sc-service = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
+substrate-test-utils = { workspace = true }
 
 tokio = { features = ["macros"], workspace = true, default-features = true }
diff --git a/polkadot/primitives/Cargo.toml b/polkadot/primitives/Cargo.toml
index 150aaf153fa75a4d1f94dba7154d34718e1c28f4..e693fe8c4a8ce2ef803b8248ee614225822fef5a 100644
--- a/polkadot/primitives/Cargo.toml
+++ b/polkadot/primitives/Cargo.toml
@@ -13,23 +13,23 @@ workspace = true
 
 [dependencies]
 bitvec = { features = ["alloc", "serde"], workspace = true }
-hex-literal = { workspace = true, default-features = true }
 codec = { features = ["bit-vec", "derive"], workspace = true }
-scale-info = { features = ["bit-vec", "derive", "serde"], workspace = true }
+hex-literal = { workspace = true, default-features = true }
 log = { workspace = true }
+scale-info = { features = ["bit-vec", "derive", "serde"], workspace = true }
 serde = { features = ["alloc", "derive"], workspace = true }
 thiserror = { workspace = true, optional = true }
 
-sp-application-crypto = { features = ["serde"], workspace = true }
-sp-inherents = { workspace = true }
-sp-core = { workspace = true }
-sp-runtime = { workspace = true }
 sp-api = { workspace = true }
+sp-application-crypto = { features = ["serde"], workspace = true }
 sp-arithmetic = { features = ["serde"], workspace = true }
 sp-authority-discovery = { features = ["serde"], workspace = true }
 sp-consensus-slots = { features = ["serde"], workspace = true }
+sp-core = { workspace = true }
+sp-inherents = { workspace = true }
 sp-io = { workspace = true }
 sp-keystore = { optional = true, workspace = true }
+sp-runtime = { workspace = true }
 sp-staking = { features = ["serde"], workspace = true }
 sp-std = { workspace = true, optional = true }
 
diff --git a/polkadot/primitives/test-helpers/Cargo.toml b/polkadot/primitives/test-helpers/Cargo.toml
index 27de3c4b9c56c6fbd182c3c0126325b5e80f7131..962b210848c894a1db5bdf19fe5297a99f84d3ca 100644
--- a/polkadot/primitives/test-helpers/Cargo.toml
+++ b/polkadot/primitives/test-helpers/Cargo.toml
@@ -10,9 +10,9 @@ license.workspace = true
 workspace = true
 
 [dependencies]
-sp-keyring = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true }
-sp-runtime = { workspace = true, default-features = true }
-sp-core = { features = ["std"], workspace = true, default-features = true }
 polkadot-primitives = { features = ["test"], workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
+sp-application-crypto = { workspace = true }
+sp-core = { features = ["std"], workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
diff --git a/polkadot/rpc/Cargo.toml b/polkadot/rpc/Cargo.toml
index 48980dde4bbce53428f904aed56aeac73c72ebe6..33ce3ff4acc68ce35a4956196b8871eb1cc77779 100644
--- a/polkadot/rpc/Cargo.toml
+++ b/polkadot/rpc/Cargo.toml
@@ -13,19 +13,11 @@ workspace = true
 
 [dependencies]
 jsonrpsee = { features = ["server"], workspace = true }
+mmr-rpc = { workspace = true, default-features = true }
+pallet-transaction-payment-rpc = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-sp-blockchain = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
-sp-api = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
-sp-consensus-babe = { workspace = true, default-features = true }
-sp-consensus-beefy = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true, default-features = true }
-sc-rpc = { workspace = true, default-features = true }
-sc-rpc-spec-v2 = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
 sc-consensus-babe = { workspace = true, default-features = true }
 sc-consensus-babe-rpc = { workspace = true, default-features = true }
 sc-consensus-beefy = { workspace = true, default-features = true }
@@ -33,10 +25,18 @@ sc-consensus-beefy-rpc = { workspace = true, default-features = true }
 sc-consensus-epochs = { workspace = true, default-features = true }
 sc-consensus-grandpa = { workspace = true, default-features = true }
 sc-consensus-grandpa-rpc = { workspace = true, default-features = true }
+sc-rpc = { workspace = true, default-features = true }
+sc-rpc-spec-v2 = { workspace = true, default-features = true }
 sc-sync-state-rpc = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
-substrate-frame-rpc-system = { workspace = true, default-features = true }
-mmr-rpc = { workspace = true, default-features = true }
-pallet-transaction-payment-rpc = { workspace = true, default-features = true }
+sp-api = { workspace = true, default-features = true }
+sp-application-crypto = { workspace = true, default-features = true }
 sp-block-builder = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-consensus-babe = { workspace = true, default-features = true }
+sp-consensus-beefy = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+substrate-frame-rpc-system = { workspace = true, default-features = true }
 substrate-state-trie-migration-rpc = { workspace = true, default-features = true }
diff --git a/polkadot/runtime/common/Cargo.toml b/polkadot/runtime/common/Cargo.toml
index 4b307b56bcbe1a288b099b2f925e071f7c201fe0..4ffa5c475ed779fb19e0f777770f5ff72c9ef499 100644
--- a/polkadot/runtime/common/Cargo.toml
+++ b/polkadot/runtime/common/Cargo.toml
@@ -12,9 +12,9 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-impl-trait-for-tuples = { workspace = true }
 bitvec = { features = ["alloc"], workspace = true }
 codec = { features = ["derive"], workspace = true }
+impl-trait-for-tuples = { workspace = true }
 log = { workspace = true }
 rustc-hex = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
@@ -23,55 +23,55 @@ serde_derive = { workspace = true }
 static_assertions = { workspace = true, default-features = true }
 
 sp-api = { workspace = true }
+sp-core = { features = ["serde"], workspace = true }
 sp-inherents = { workspace = true }
 sp-io = { workspace = true }
+sp-keyring = { workspace = true }
+sp-npos-elections = { features = ["serde"], workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
 sp-session = { workspace = true }
 sp-staking = { features = ["serde"], workspace = true }
-sp-core = { features = ["serde"], workspace = true }
-sp-keyring = { workspace = true }
-sp-npos-elections = { features = ["serde"], workspace = true }
 
+frame-election-provider-support = { workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+pallet-asset-rate = { optional = true, workspace = true }
 pallet-authorship = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-broker = { workspace = true }
+pallet-election-provider-multi-phase = { workspace = true }
 pallet-fast-unstake = { workspace = true }
 pallet-identity = { workspace = true }
 pallet-session = { workspace = true }
-frame-support = { workspace = true }
 pallet-staking = { workspace = true }
 pallet-staking-reward-fn = { workspace = true }
-frame-system = { workspace = true }
 pallet-timestamp = { workspace = true }
-pallet-vesting = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-treasury = { workspace = true }
-pallet-asset-rate = { optional = true, workspace = true }
-pallet-election-provider-multi-phase = { workspace = true }
-frame-election-provider-support = { workspace = true }
+pallet-vesting = { workspace = true }
 
 frame-benchmarking = { optional = true, workspace = true }
 pallet-babe = { optional = true, workspace = true }
 
-polkadot-primitives = { workspace = true }
 libsecp256k1 = { workspace = true }
+polkadot-primitives = { workspace = true }
 polkadot-runtime-parachains = { workspace = true }
 
 slot-range-helper = { workspace = true }
 xcm = { workspace = true }
-xcm-executor = { optional = true, workspace = true }
 xcm-builder = { workspace = true }
+xcm-executor = { optional = true, workspace = true }
 
 [dev-dependencies]
-hex-literal = { workspace = true, default-features = true }
 frame-support-test = { workspace = true }
+hex-literal = { workspace = true, default-features = true }
+libsecp256k1 = { workspace = true, default-features = true }
 pallet-babe = { workspace = true, default-features = true }
 pallet-treasury = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-libsecp256k1 = { workspace = true, default-features = true }
 polkadot-primitives-test-helpers = { workspace = true }
+serde_json = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/runtime/common/slot_range_helper/Cargo.toml b/polkadot/runtime/common/slot_range_helper/Cargo.toml
index 3f110bdd76c6c94ddb9cd0f73d1c383662d7ad2e..684cdcd01e14422fdfa5e804dbf7a6d0d5e25cf6 100644
--- a/polkadot/runtime/common/slot_range_helper/Cargo.toml
+++ b/polkadot/runtime/common/slot_range_helper/Cargo.toml
@@ -12,9 +12,9 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-paste = { workspace = true, default-features = true }
-enumn = { workspace = true }
 codec = { features = ["derive"], workspace = true }
+enumn = { workspace = true }
+paste = { workspace = true, default-features = true }
 sp-runtime = { workspace = true }
 
 [features]
diff --git a/polkadot/runtime/metrics/Cargo.toml b/polkadot/runtime/metrics/Cargo.toml
index 0415e4754009c73eb2d9297b6424fd1613968f37..beb7e3236d5a8b4efbf37ec69af4ad648f9916fc 100644
--- a/polkadot/runtime/metrics/Cargo.toml
+++ b/polkadot/runtime/metrics/Cargo.toml
@@ -12,10 +12,10 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-sp-tracing = { workspace = true }
 codec = { workspace = true }
-polkadot-primitives = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
+polkadot-primitives = { workspace = true }
+sp-tracing = { workspace = true }
 
 bs58 = { features = ["alloc"], workspace = true }
 
diff --git a/polkadot/runtime/parachains/Cargo.toml b/polkadot/runtime/parachains/Cargo.toml
index b583e9c6cc50e46876ce31b92d896aed3b716c2d..7c00995d2291e7bc872da4c20f8b370f83b4347d 100644
--- a/polkadot/runtime/parachains/Cargo.toml
+++ b/polkadot/runtime/parachains/Cargo.toml
@@ -12,32 +12,35 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-impl-trait-for-tuples = { workspace = true }
+bitflags = { workspace = true }
 bitvec = { features = ["alloc"], workspace = true }
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
+derive_more = { workspace = true, default-features = true }
+impl-trait-for-tuples = { workspace = true }
 log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { features = ["alloc", "derive"], workspace = true }
-derive_more = { workspace = true, default-features = true }
-bitflags = { workspace = true }
 
 sp-api = { workspace = true }
+sp-application-crypto = { optional = true, workspace = true }
+sp-arithmetic = { workspace = true }
+sp-core = { features = ["serde"], workspace = true }
 sp-inherents = { workspace = true }
 sp-io = { workspace = true }
+sp-keystore = { optional = true, workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
 sp-session = { workspace = true }
 sp-staking = { features = ["serde"], workspace = true }
-sp-core = { features = ["serde"], workspace = true }
-sp-keystore = { optional = true, workspace = true }
-sp-application-crypto = { optional = true, workspace = true }
-sp-tracing = { optional = true, workspace = true }
-sp-arithmetic = { workspace = true }
 sp-std = { workspace = true, optional = true }
+sp-tracing = { optional = true, workspace = true }
 
+frame-benchmarking = { optional = true, workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
 pallet-authority-discovery = { workspace = true }
 pallet-authorship = { workspace = true }
-pallet-balances = { workspace = true }
 pallet-babe = { workspace = true }
+pallet-balances = { workspace = true }
 pallet-broker = { workspace = true }
 pallet-message-queue = { workspace = true }
 pallet-mmr = { workspace = true, optional = true }
@@ -45,36 +48,33 @@ pallet-session = { workspace = true }
 pallet-staking = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-vesting = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
 
+polkadot-primitives = { workspace = true }
 xcm = { workspace = true }
 xcm-executor = { workspace = true }
-polkadot-primitives = { workspace = true }
 
+polkadot-core-primitives = { workspace = true }
+polkadot-parachain-primitives = { workspace = true }
+polkadot-runtime-metrics = { workspace = true }
 rand = { workspace = true }
 rand_chacha = { workspace = true }
 static_assertions = { optional = true, workspace = true, default-features = true }
-polkadot-parachain-primitives = { workspace = true }
-polkadot-runtime-metrics = { workspace = true }
-polkadot-core-primitives = { workspace = true }
 
 [dev-dependencies]
 polkadot-primitives = { workspace = true, features = ["test"] }
 
+assert_matches = { workspace = true }
+frame-support-test = { workspace = true }
 futures = { workspace = true }
 hex-literal = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
-frame-support-test = { workspace = true }
-sc-keystore = { workspace = true, default-features = true }
 polkadot-primitives-test-helpers = { workspace = true }
-sp-tracing = { workspace = true, default-features = true }
-sp-crypto-hashing = { workspace = true, default-features = true }
-thousands = { workspace = true }
-assert_matches = { workspace = true }
 rstest = { workspace = true }
+sc-keystore = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
+sp-crypto-hashing = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
+thousands = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/runtime/rococo/Cargo.toml b/polkadot/runtime/rococo/Cargo.toml
index 1fd32c5d0c3221410b7bcfd06d8d38ecf972c075..e7f463566e3a6350a5c6c336e642f7c5738844af 100644
--- a/polkadot/runtime/rococo/Cargo.toml
+++ b/polkadot/runtime/rococo/Cargo.toml
@@ -13,39 +13,44 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
+bitvec = { features = ["alloc"], workspace = true }
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 serde = { workspace = true }
 serde_derive = { optional = true, workspace = true }
 serde_json = { features = ["alloc"], workspace = true }
-static_assertions = { workspace = true, default-features = true }
 smallvec = { workspace = true, default-features = true }
-bitvec = { features = ["alloc"], workspace = true }
+static_assertions = { workspace = true, default-features = true }
 
+binary-merkle-tree = { workspace = true }
+rococo-runtime-constants = { workspace = true }
+sp-api = { workspace = true }
+sp-arithmetic = { workspace = true }
 sp-authority-discovery = { workspace = true }
+sp-block-builder = { workspace = true }
 sp-consensus-babe = { workspace = true }
 sp-consensus-beefy = { workspace = true }
 sp-consensus-grandpa = { workspace = true }
-binary-merkle-tree = { workspace = true }
-rococo-runtime-constants = { workspace = true }
-sp-api = { workspace = true }
+sp-core = { workspace = true }
 sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
-sp-offchain = { workspace = true }
-sp-arithmetic = { workspace = true }
 sp-io = { workspace = true }
+sp-keyring = { workspace = true }
 sp-mmr-primitives = { workspace = true }
+sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
-sp-staking = { workspace = true }
-sp-core = { workspace = true }
 sp-session = { workspace = true }
+sp-staking = { workspace = true }
 sp-storage = { workspace = true }
-sp-version = { workspace = true }
 sp-transaction-pool = { workspace = true }
-sp-block-builder = { workspace = true }
-sp-keyring = { workspace = true }
+sp-version = { workspace = true }
 
+frame-executive = { workspace = true }
+frame-support = { features = ["tuples-96"], workspace = true }
+frame-system = { workspace = true }
+frame-system-rpc-runtime-api = { workspace = true }
+pallet-asset-rate = { workspace = true }
 pallet-authority-discovery = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-babe = { workspace = true }
@@ -54,15 +59,10 @@ pallet-beefy = { workspace = true }
 pallet-beefy-mmr = { workspace = true }
 pallet-bounties = { workspace = true }
 pallet-child-bounties = { workspace = true }
-pallet-state-trie-migration = { workspace = true }
-pallet-transaction-payment = { workspace = true }
-pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-collective = { workspace = true }
 pallet-conviction-voting = { workspace = true }
 pallet-democracy = { workspace = true }
 pallet-elections-phragmen = { workspace = true }
-pallet-asset-rate = { workspace = true }
-frame-executive = { workspace = true }
 pallet-grandpa = { workspace = true }
 pallet-identity = { workspace = true }
 pallet-indices = { workspace = true }
@@ -79,48 +79,48 @@ pallet-proxy = { workspace = true }
 pallet-ranked-collective = { workspace = true }
 pallet-recovery = { workspace = true }
 pallet-referenda = { workspace = true }
+pallet-root-testing = { workspace = true }
 pallet-scheduler = { workspace = true }
 pallet-session = { workspace = true }
 pallet-society = { workspace = true }
-pallet-sudo = { workspace = true }
-frame-support = { features = ["tuples-96"], workspace = true }
 pallet-staking = { workspace = true }
-frame-system = { workspace = true }
-frame-system-rpc-runtime-api = { workspace = true }
+pallet-state-trie-migration = { workspace = true }
+pallet-sudo = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-tips = { workspace = true }
+pallet-transaction-payment = { workspace = true }
+pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-treasury = { workspace = true }
 pallet-utility = { workspace = true }
 pallet-vesting = { workspace = true }
 pallet-whitelist = { workspace = true }
 pallet-xcm = { workspace = true }
 pallet-xcm-benchmarks = { optional = true, workspace = true }
-pallet-root-testing = { workspace = true }
 
 frame-benchmarking = { optional = true, workspace = true }
 frame-metadata-hash-extension = { workspace = true }
-frame-try-runtime = { optional = true, workspace = true }
 frame-system-benchmarking = { optional = true, workspace = true }
+frame-try-runtime = { optional = true, workspace = true }
 hex-literal = { workspace = true, default-features = true }
 
+polkadot-parachain-primitives = { workspace = true }
+polkadot-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
 polkadot-runtime-parachains = { workspace = true }
-polkadot-primitives = { workspace = true }
-polkadot-parachain-primitives = { workspace = true }
 
 xcm = { workspace = true }
-xcm-executor = { workspace = true }
 xcm-builder = { workspace = true }
+xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 [dev-dependencies]
-tiny-keccak = { features = ["keccak"], workspace = true }
-sp-keyring = { workspace = true, default-features = true }
 remote-externalities = { workspace = true, default-features = true }
-sp-trie = { workspace = true, default-features = true }
 separator = { workspace = true }
 serde_json = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 sp-tracing = { workspace = true }
+sp-trie = { workspace = true, default-features = true }
+tiny-keccak = { features = ["keccak"], workspace = true }
 tokio = { features = ["macros"], workspace = true, default-features = true }
 
 [build-dependencies]
diff --git a/polkadot/runtime/rococo/constants/Cargo.toml b/polkadot/runtime/rococo/constants/Cargo.toml
index 921bc8f5fe92f679bc256b5a6d1d940225dec3f0..cc62d230d2c012457efa3b538a41d71243c7aede 100644
--- a/polkadot/runtime/rococo/constants/Cargo.toml
+++ b/polkadot/runtime/rococo/constants/Cargo.toml
@@ -20,9 +20,9 @@ smallvec = { workspace = true, default-features = true }
 frame-support = { workspace = true }
 polkadot-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
+sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 sp-weights = { workspace = true }
-sp-core = { workspace = true }
 
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
diff --git a/polkadot/runtime/test-runtime/Cargo.toml b/polkadot/runtime/test-runtime/Cargo.toml
index 8b33bf9cebc6893cf798d99c7788f9da36c85870..f35bb53ac904970671f9fc67bab22e049511b973 100644
--- a/polkadot/runtime/test-runtime/Cargo.toml
+++ b/polkadot/runtime/test-runtime/Cargo.toml
@@ -16,59 +16,59 @@ log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { workspace = true }
 
+frame-election-provider-support = { workspace = true }
+sp-api = { workspace = true }
 sp-authority-discovery = { workspace = true }
+sp-block-builder = { workspace = true }
 sp-consensus-babe = { workspace = true }
 sp-consensus-beefy = { workspace = true }
-sp-api = { workspace = true }
-sp-inherents = { workspace = true }
-sp-offchain = { workspace = true }
-sp-io = { workspace = true }
-sp-runtime = { workspace = true }
-sp-staking = { workspace = true }
 sp-core = { workspace = true }
 sp-genesis-builder = { workspace = true }
+sp-inherents = { workspace = true }
+sp-io = { workspace = true }
 sp-mmr-primitives = { workspace = true }
+sp-offchain = { workspace = true }
+sp-runtime = { workspace = true }
 sp-session = { workspace = true }
-sp-version = { workspace = true }
-frame-election-provider-support = { workspace = true }
+sp-staking = { workspace = true }
 sp-transaction-pool = { workspace = true }
-sp-block-builder = { workspace = true }
+sp-version = { workspace = true }
 
+frame-executive = { workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+frame-system-rpc-runtime-api = { workspace = true }
 pallet-authority-discovery = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-babe = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-transaction-payment = { workspace = true }
-pallet-transaction-payment-rpc-runtime-api = { workspace = true }
-frame-executive = { workspace = true }
 pallet-grandpa = { workspace = true }
 pallet-indices = { workspace = true }
 pallet-offences = { workspace = true }
 pallet-session = { workspace = true }
-frame-support = { workspace = true }
 pallet-staking = { workspace = true }
 pallet-staking-reward-curve = { workspace = true, default-features = true }
-frame-system = { workspace = true }
-frame-system-rpc-runtime-api = { workspace = true }
-test-runtime-constants = { workspace = true }
-pallet-timestamp = { workspace = true }
 pallet-sudo = { workspace = true }
+pallet-timestamp = { workspace = true }
+pallet-transaction-payment = { workspace = true }
+pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-vesting = { workspace = true }
+test-runtime-constants = { workspace = true }
 
-polkadot-runtime-common = { workspace = true }
-polkadot-primitives = { workspace = true }
 pallet-xcm = { workspace = true }
+polkadot-primitives = { workspace = true }
+polkadot-runtime-common = { workspace = true }
 polkadot-runtime-parachains = { workspace = true }
+xcm = { workspace = true }
 xcm-builder = { workspace = true }
 xcm-executor = { workspace = true }
-xcm = { workspace = true }
 
 [dev-dependencies]
 hex-literal = { workspace = true, default-features = true }
-tiny-keccak = { features = ["keccak"], workspace = true }
+serde_json = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 sp-trie = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
+tiny-keccak = { features = ["keccak"], workspace = true }
 
 [build-dependencies]
 substrate-wasm-builder = { workspace = true, default-features = true }
diff --git a/polkadot/runtime/westend/Cargo.toml b/polkadot/runtime/westend/Cargo.toml
index 13e39b5aa3171527bf33908208d7f5403d6ba912..e945e64e7fc071db211fbe3ca5ac80bccfe33426 100644
--- a/polkadot/runtime/westend/Cargo.toml
+++ b/polkadot/runtime/westend/Cargo.toml
@@ -15,36 +15,36 @@ workspace = true
 [dependencies]
 bitvec = { features = ["alloc"], workspace = true }
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 serde = { workspace = true }
 serde_derive = { optional = true, workspace = true }
 serde_json = { features = ["alloc"], workspace = true }
 smallvec = { workspace = true, default-features = true }
 
-sp-authority-discovery = { workspace = true }
-sp-consensus-babe = { workspace = true }
-sp-consensus-beefy = { workspace = true }
-sp-consensus-grandpa = { workspace = true }
 binary-merkle-tree = { workspace = true }
-sp-inherents = { workspace = true }
-sp-offchain = { workspace = true }
 sp-api = { workspace = true }
 sp-application-crypto = { workspace = true }
 sp-arithmetic = { workspace = true }
+sp-authority-discovery = { workspace = true }
+sp-block-builder = { workspace = true }
+sp-consensus-babe = { workspace = true }
+sp-consensus-beefy = { workspace = true }
+sp-consensus-grandpa = { workspace = true }
+sp-core = { workspace = true }
 sp-genesis-builder = { workspace = true }
+sp-inherents = { workspace = true }
 sp-io = { workspace = true }
+sp-keyring = { workspace = true }
 sp-mmr-primitives = { workspace = true }
+sp-npos-elections = { workspace = true }
+sp-offchain = { workspace = true }
 sp-runtime = { workspace = true }
-sp-staking = { workspace = true }
-sp-core = { workspace = true }
 sp-session = { workspace = true }
+sp-staking = { workspace = true }
 sp-storage = { workspace = true }
-sp-version = { workspace = true }
 sp-transaction-pool = { workspace = true }
-sp-block-builder = { workspace = true }
-sp-npos-elections = { workspace = true }
-sp-keyring = { workspace = true }
+sp-version = { workspace = true }
 
 frame-election-provider-support = { workspace = true }
 frame-executive = { workspace = true }
@@ -52,7 +52,6 @@ frame-metadata-hash-extension = { workspace = true }
 frame-support = { features = ["experimental", "tuples-96"], workspace = true }
 frame-system = { workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
-westend-runtime-constants = { workspace = true }
 pallet-asset-rate = { workspace = true }
 pallet-authority-discovery = { workspace = true }
 pallet-authorship = { workspace = true }
@@ -62,9 +61,11 @@ pallet-balances = { workspace = true }
 pallet-beefy = { workspace = true }
 pallet-beefy-mmr = { workspace = true }
 pallet-collective = { workspace = true }
+pallet-conviction-voting = { workspace = true }
+pallet-delegated-staking = { workspace = true }
 pallet-democracy = { workspace = true }
-pallet-elections-phragmen = { workspace = true }
 pallet-election-provider-multi-phase = { workspace = true }
+pallet-elections-phragmen = { workspace = true }
 pallet-fast-unstake = { workspace = true }
 pallet-grandpa = { workspace = true }
 pallet-identity = { workspace = true }
@@ -75,60 +76,59 @@ pallet-migrations = { workspace = true }
 pallet-mmr = { workspace = true }
 pallet-multisig = { workspace = true }
 pallet-nomination-pools = { workspace = true }
-pallet-conviction-voting = { workspace = true }
+pallet-nomination-pools-runtime-api = { workspace = true }
 pallet-offences = { workspace = true }
 pallet-parameters = { workspace = true }
 pallet-preimage = { workspace = true }
 pallet-proxy = { workspace = true }
 pallet-recovery = { workspace = true }
 pallet-referenda = { workspace = true }
+pallet-root-testing = { workspace = true }
 pallet-scheduler = { workspace = true }
 pallet-session = { workspace = true }
 pallet-society = { workspace = true }
 pallet-staking = { workspace = true }
 pallet-staking-runtime-api = { workspace = true }
-pallet-delegated-staking = { workspace = true }
 pallet-state-trie-migration = { workspace = true }
 pallet-sudo = { workspace = true }
 pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
-pallet-nomination-pools-runtime-api = { workspace = true }
 pallet-treasury = { workspace = true }
 pallet-utility = { workspace = true }
 pallet-vesting = { workspace = true }
 pallet-whitelist = { workspace = true }
 pallet-xcm = { workspace = true }
 pallet-xcm-benchmarks = { optional = true, workspace = true }
-pallet-root-testing = { workspace = true }
+westend-runtime-constants = { workspace = true }
 
 frame-benchmarking = { optional = true, workspace = true }
-frame-try-runtime = { optional = true, workspace = true }
 frame-system-benchmarking = { optional = true, workspace = true }
+frame-try-runtime = { optional = true, workspace = true }
+hex-literal = { workspace = true, default-features = true }
 pallet-election-provider-support-benchmarking = { optional = true, workspace = true }
 pallet-nomination-pools-benchmarking = { optional = true, workspace = true }
 pallet-offences-benchmarking = { optional = true, workspace = true }
 pallet-session-benchmarking = { optional = true, workspace = true }
-hex-literal = { workspace = true, default-features = true }
 
-polkadot-runtime-common = { workspace = true }
-polkadot-primitives = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
+polkadot-primitives = { workspace = true }
+polkadot-runtime-common = { workspace = true }
 polkadot-runtime-parachains = { workspace = true }
 
 xcm = { workspace = true }
-xcm-executor = { workspace = true }
 xcm-builder = { workspace = true }
+xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 [dev-dependencies]
 approx = { workspace = true }
-tiny-keccak = { features = ["keccak"], workspace = true }
-sp-keyring = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
 remote-externalities = { workspace = true, default-features = true }
-tokio = { features = ["macros"], workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
 sp-tracing = { workspace = true }
+tiny-keccak = { features = ["keccak"], workspace = true }
+tokio = { features = ["macros"], workspace = true, default-features = true }
 
 [build-dependencies]
 substrate-wasm-builder = { workspace = true, default-features = true }
diff --git a/polkadot/runtime/westend/constants/Cargo.toml b/polkadot/runtime/westend/constants/Cargo.toml
index a50e2f9cc639f0c2e2586e113de368d2ccb0028b..f3dbcc309ee1e79b4449a050aa49f78d75f49274 100644
--- a/polkadot/runtime/westend/constants/Cargo.toml
+++ b/polkadot/runtime/westend/constants/Cargo.toml
@@ -20,9 +20,9 @@ smallvec = { workspace = true, default-features = true }
 frame-support = { workspace = true }
 polkadot-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
+sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 sp-weights = { workspace = true }
-sp-core = { workspace = true }
 
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
diff --git a/polkadot/statement-table/Cargo.toml b/polkadot/statement-table/Cargo.toml
index d9519dafe12d6e93205c761f85d84499e6e64dc1..1155600f3d0ce90c85d1ead8d16a773a4164a154 100644
--- a/polkadot/statement-table/Cargo.toml
+++ b/polkadot/statement-table/Cargo.toml
@@ -13,6 +13,6 @@ workspace = true
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-sp-core = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 gum = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
diff --git a/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml b/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
index 206ca8cf19a90df9bc2becd0c65039f35d714191..1a6c23e0518eb2cd703d427da478f4601daf6e4e 100644
--- a/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
+++ b/polkadot/utils/remote-ext-tests/bags-list/Cargo.toml
@@ -13,10 +13,10 @@ workspace = true
 westend-runtime = { workspace = true }
 westend-runtime-constants = { workspace = true, default-features = true }
 
-pallet-bags-list-remote-tests = { workspace = true }
-sp-tracing = { workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
+pallet-bags-list-remote-tests = { workspace = true }
 sp-core = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 
 clap = { features = ["derive"], workspace = true }
 log = { workspace = true, default-features = true }
diff --git a/polkadot/xcm/Cargo.toml b/polkadot/xcm/Cargo.toml
index 7ac12dc1e377caf278e80011a927083134c114cd..e90354e4e6ac7697df704e495ee08a56c7df587e 100644
--- a/polkadot/xcm/Cargo.toml
+++ b/polkadot/xcm/Cargo.toml
@@ -14,23 +14,23 @@ workspace = true
 [dependencies]
 array-bytes = { workspace = true, default-features = true }
 bounded-collections = { features = ["serde"], workspace = true }
+codec = { features = ["derive", "max-encoded-len"], workspace = true }
 derivative = { features = ["use_core"], workspace = true }
+environmental = { workspace = true }
+frame-support = { workspace = true }
+hex-literal = { workspace = true, default-features = true }
 impl-trait-for-tuples = { workspace = true }
 log = { workspace = true }
-codec = { features = ["derive", "max-encoded-len"], workspace = true }
 scale-info = { features = ["derive", "serde"], workspace = true }
+schemars = { default-features = true, optional = true, workspace = true }
+serde = { features = ["alloc", "derive", "rc"], workspace = true }
 sp-runtime = { workspace = true }
 sp-weights = { features = ["serde"], workspace = true }
-serde = { features = ["alloc", "derive", "rc"], workspace = true }
-schemars = { default-features = true, optional = true, workspace = true }
 xcm-procedural = { workspace = true, default-features = true }
-environmental = { workspace = true }
-hex-literal = { workspace = true, default-features = true }
-frame-support = { workspace = true }
 
 [dev-dependencies]
-sp-io = { workspace = true, default-features = true }
 hex = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/xcm/docs/Cargo.toml b/polkadot/xcm/docs/Cargo.toml
index 9d8f4c0a6430b71e2b2d1ba09719a8c397b4e4d5..6fa7ea9a23a92c2e3f86082a630ca3994bfce1d1 100644
--- a/polkadot/xcm/docs/Cargo.toml
+++ b/polkadot/xcm/docs/Cargo.toml
@@ -10,30 +10,30 @@ publish = false
 
 [dependencies]
 # For XCM stuff
+pallet-xcm = { workspace = true, default-features = true }
 xcm = { workspace = true, default-features = true }
-xcm-executor = { workspace = true, default-features = true }
 xcm-builder = { workspace = true, default-features = true }
+xcm-executor = { workspace = true, default-features = true }
 xcm-simulator = { workspace = true, default-features = true }
-pallet-xcm = { workspace = true, default-features = true }
 
 # For building FRAME runtimes
-frame = { features = ["experimental", "runtime"], workspace = true, default-features = true }
 codec = { workspace = true, default-features = true }
-scale-info = { workspace = true }
+frame = { features = ["experimental", "runtime"], workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
-polkadot-runtime-parachains = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
+polkadot-runtime-parachains = { workspace = true, default-features = true }
+scale-info = { workspace = true }
+sp-io = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-std = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
 
 # Some pallets
-pallet-message-queue = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
+pallet-message-queue = { workspace = true, default-features = true }
 
 # For building docs
-simple-mermaid = { git = "https://github.com/kianenigma/simple-mermaid.git", branch = "main" }
 docify = { workspace = true }
+simple-mermaid = { git = "https://github.com/kianenigma/simple-mermaid.git", branch = "main" }
 
 [dev-dependencies]
 test-log = { workspace = true }
diff --git a/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml b/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml
index d4131cc53ee66cb0f69475bf03078f0aa4ed631b..5d5926ae01e0d9d2f9671892607a49246a20656e 100644
--- a/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml
+++ b/polkadot/xcm/pallet-xcm-benchmarks/Cargo.toml
@@ -16,20 +16,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
+frame-benchmarking = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-sp-runtime = { workspace = true }
+log = { workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
-xcm-executor = { workspace = true }
-frame-benchmarking = { workspace = true }
+sp-runtime = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
-log = { workspace = true, default-features = true }
+xcm-executor = { workspace = true }
 
 [dev-dependencies]
-pallet-balances = { workspace = true, default-features = true }
 pallet-assets = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 xcm = { workspace = true, default-features = true }
 # temp
diff --git a/polkadot/xcm/pallet-xcm/Cargo.toml b/polkadot/xcm/pallet-xcm/Cargo.toml
index 81fcea05cac20f3e7f5eb5e5d62bce5a2857e763..85beba03b15762dea5c36a82eee9294e87dcd83a 100644
--- a/polkadot/xcm/pallet-xcm/Cargo.toml
+++ b/polkadot/xcm/pallet-xcm/Cargo.toml
@@ -25,8 +25,8 @@ sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
 xcm = { workspace = true }
-xcm-executor = { workspace = true }
 xcm-builder = { workspace = true }
+xcm-executor = { workspace = true }
 xcm-runtime-apis = { workspace = true }
 
 # marked optional, used in benchmarking
@@ -35,8 +35,8 @@ pallet-balances = { optional = true, workspace = true }
 
 [dev-dependencies]
 pallet-assets = { workspace = true, default-features = true }
-polkadot-runtime-parachains = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-runtime-parachains = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/xcm/procedural/Cargo.toml b/polkadot/xcm/procedural/Cargo.toml
index 88ed3c94ddf4fe1ef99cfc60f49e79feb6c23a37..0843da86f038b6b6cf307527d080f29e8271c6e9 100644
--- a/polkadot/xcm/procedural/Cargo.toml
+++ b/polkadot/xcm/procedural/Cargo.toml
@@ -16,10 +16,10 @@ workspace = true
 proc-macro = true
 
 [dependencies]
+Inflector = { workspace = true }
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
 syn = { workspace = true }
-Inflector = { workspace = true }
 
 [dev-dependencies]
 trybuild = { features = ["diff"], workspace = true }
diff --git a/polkadot/xcm/xcm-builder/Cargo.toml b/polkadot/xcm/xcm-builder/Cargo.toml
index e64ab19281323cdabf97cf80a95ba6682ed39e17..f75c984c068eac33fa5c8e88989cc7ba7001aeb1 100644
--- a/polkadot/xcm/xcm-builder/Cargo.toml
+++ b/polkadot/xcm/xcm-builder/Cargo.toml
@@ -12,35 +12,35 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-impl-trait-for-tuples = { workspace = true }
 codec = { features = ["derive"], workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
+log = { workspace = true }
+pallet-asset-conversion = { workspace = true }
+pallet-transaction-payment = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-xcm = { workspace = true }
-xcm-executor = { workspace = true }
 sp-arithmetic = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-weights = { workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
-pallet-transaction-payment = { workspace = true }
-pallet-asset-conversion = { workspace = true }
-log = { workspace = true }
+xcm = { workspace = true }
+xcm-executor = { workspace = true }
 
 # Polkadot dependencies
 polkadot-parachain-primitives = { workspace = true }
 
 [dev-dependencies]
-sp-core = { workspace = true, default-features = true }
-primitive-types = { features = ["codec", "num-traits", "scale-info"], workspace = true }
+assert_matches = { workspace = true }
+pallet-assets = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
-pallet-xcm = { workspace = true, default-features = true }
 pallet-salary = { workspace = true, default-features = true }
-pallet-assets = { workspace = true, default-features = true }
+pallet-xcm = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
 polkadot-runtime-parachains = { workspace = true, default-features = true }
-assert_matches = { workspace = true }
 polkadot-test-runtime = { workspace = true }
+primitive-types = { features = ["codec", "num-traits", "scale-info"], workspace = true }
+sp-core = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/xcm/xcm-executor/Cargo.toml b/polkadot/xcm/xcm-executor/Cargo.toml
index eb558c0fcc191c6aaefc41fea99f6fc15475e290..381dca54a5fba1fcb8e5fad76814e9206c73a095 100644
--- a/polkadot/xcm/xcm-executor/Cargo.toml
+++ b/polkadot/xcm/xcm-executor/Cargo.toml
@@ -12,19 +12,19 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-impl-trait-for-tuples = { workspace = true }
-environmental = { workspace = true }
 codec = { features = ["derive"], workspace = true }
+environmental = { workspace = true }
+frame-benchmarking = { optional = true, workspace = true }
+frame-support = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
 scale-info = { features = ["derive", "serde"], workspace = true }
-xcm = { workspace = true }
-sp-io = { workspace = true }
 sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
+sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-weights = { workspace = true }
-frame-support = { workspace = true }
 tracing = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
+xcm = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/xcm/xcm-executor/integration-tests/Cargo.toml b/polkadot/xcm/xcm-executor/integration-tests/Cargo.toml
index a89dd74a44faf6140f228d15748b3c3ca0c5510f..6c2e56669bc378a32d96785dfcc8f668e5e8e3cd 100644
--- a/polkadot/xcm/xcm-executor/integration-tests/Cargo.toml
+++ b/polkadot/xcm/xcm-executor/integration-tests/Cargo.toml
@@ -15,21 +15,21 @@ codec = { workspace = true, default-features = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true, default-features = true }
 futures = { workspace = true }
-pallet-transaction-payment = { workspace = true, default-features = true }
 pallet-sudo = { workspace = true, default-features = true }
+pallet-transaction-payment = { workspace = true, default-features = true }
 pallet-xcm = { workspace = true, default-features = true }
 polkadot-runtime-parachains = { workspace = true, default-features = true }
 polkadot-test-client = { workspace = true }
 polkadot-test-runtime = { workspace = true }
 polkadot-test-service = { workspace = true }
 sp-consensus = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 sp-runtime = { workspace = true }
 sp-state-machine = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 xcm = { workspace = true }
 xcm-executor = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/xcm/xcm-runtime-apis/Cargo.toml b/polkadot/xcm/xcm-runtime-apis/Cargo.toml
index 9ada69a1933ba2b8e8d54411b810c0a17986fe1b..96afb10e53971cb128d68b1608773fb7ccd265d0 100644
--- a/polkadot/xcm/xcm-runtime-apis/Cargo.toml
+++ b/polkadot/xcm/xcm-runtime-apis/Cargo.toml
@@ -21,17 +21,17 @@ xcm = { workspace = true }
 xcm-executor = { workspace = true }
 
 [dev-dependencies]
+frame-executive = { workspace = true }
 frame-system = { workspace = true }
-sp-io = { workspace = true }
-xcm-builder = { workspace = true }
 hex-literal = { workspace = true }
-pallet-xcm = { workspace = true }
-pallet-balances = { workspace = true }
-pallet-assets = { workspace = true }
-xcm-executor = { workspace = true }
-frame-executive = { workspace = true }
 log = { workspace = true }
+pallet-assets = { workspace = true }
+pallet-balances = { workspace = true }
+pallet-xcm = { workspace = true }
+sp-io = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
+xcm-builder = { workspace = true }
+xcm-executor = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/polkadot/xcm/xcm-simulator/Cargo.toml b/polkadot/xcm/xcm-simulator/Cargo.toml
index 47900e226d4829cebc99a2ee941a6626041770fe..10c6f14bc8b960c68deb5297bebecb3315f25214 100644
--- a/polkadot/xcm/xcm-simulator/Cargo.toml
+++ b/polkadot/xcm/xcm-simulator/Cargo.toml
@@ -13,19 +13,19 @@ workspace = true
 
 [dependencies]
 codec = { workspace = true, default-features = true }
-scale-info = { workspace = true }
 paste = { workspace = true, default-features = true }
+scale-info = { workspace = true }
 
 frame-support = { workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = true }
 
-xcm = { workspace = true, default-features = true }
-xcm-executor = { workspace = true, default-features = true }
-xcm-builder = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
 polkadot-core-primitives = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 polkadot-runtime-parachains = { workspace = true, default-features = true }
+xcm = { workspace = true, default-features = true }
+xcm-builder = { workspace = true, default-features = true }
+xcm-executor = { workspace = true, default-features = true }
diff --git a/polkadot/xcm/xcm-simulator/example/Cargo.toml b/polkadot/xcm/xcm-simulator/example/Cargo.toml
index 43f36fc8991aea26a540cb55e6fd6ad792fc9d50..ccf0ecc39c4c89b38d0aff077f2190bed1221617 100644
--- a/polkadot/xcm/xcm-simulator/example/Cargo.toml
+++ b/polkadot/xcm/xcm-simulator/example/Cargo.toml
@@ -13,28 +13,28 @@ workspace = true
 
 [dependencies]
 codec = { workspace = true, default-features = true }
-scale-info = { features = ["derive"], workspace = true, default-features = true }
 log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true, default-features = true }
 
-frame-system = { workspace = true, default-features = true }
 frame-support = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
 pallet-message-queue = { workspace = true, default-features = true }
 pallet-uniques = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 
-xcm = { workspace = true, default-features = true }
-xcm-simulator = { workspace = true, default-features = true }
-xcm-executor = { workspace = true, default-features = true }
-xcm-builder = { workspace = true, default-features = true }
 pallet-xcm = { workspace = true, default-features = true }
 polkadot-core-primitives = { workspace = true, default-features = true }
-polkadot-runtime-parachains = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-runtime-parachains = { workspace = true, default-features = true }
+xcm = { workspace = true, default-features = true }
+xcm-builder = { workspace = true, default-features = true }
+xcm-executor = { workspace = true, default-features = true }
+xcm-simulator = { workspace = true, default-features = true }
 
 [features]
 default = []
diff --git a/polkadot/xcm/xcm-simulator/fuzzer/Cargo.toml b/polkadot/xcm/xcm-simulator/fuzzer/Cargo.toml
index a2e36db95ba610dae491b608c2e2831a5268575d..62a047975c87a5c62bc59febadd321410de6979a 100644
--- a/polkadot/xcm/xcm-simulator/fuzzer/Cargo.toml
+++ b/polkadot/xcm/xcm-simulator/fuzzer/Cargo.toml
@@ -11,30 +11,30 @@ publish = false
 workspace = true
 
 [dependencies]
+arbitrary = { workspace = true }
 codec = { workspace = true, default-features = true }
 honggfuzz = { workspace = true }
-arbitrary = { workspace = true }
 scale-info = { features = ["derive"], workspace = true, default-features = true }
 
-frame-system = { workspace = true, default-features = true }
-frame-support = { workspace = true, default-features = true }
 frame-executive = { workspace = true, default-features = true }
+frame-support = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 frame-try-runtime = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
 pallet-message-queue = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = true }
 
-xcm = { workspace = true, default-features = true }
-xcm-simulator = { workspace = true, default-features = true }
-xcm-executor = { workspace = true, default-features = true }
-xcm-builder = { workspace = true, default-features = true }
 pallet-xcm = { workspace = true, default-features = true }
 polkadot-core-primitives = { workspace = true, default-features = true }
-polkadot-runtime-parachains = { workspace = true, default-features = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-runtime-parachains = { workspace = true, default-features = true }
+xcm = { workspace = true, default-features = true }
+xcm-builder = { workspace = true, default-features = true }
+xcm-executor = { workspace = true, default-features = true }
+xcm-simulator = { workspace = true, default-features = true }
 
 [features]
 try-runtime = [
diff --git a/polkadot/zombienet-sdk-tests/Cargo.toml b/polkadot/zombienet-sdk-tests/Cargo.toml
index 4eac7af49f8a9ea4ae775491b3aaed9fb436fd60..120857c9a42e22cb1634994694915cc143e1b0cf 100644
--- a/polkadot/zombienet-sdk-tests/Cargo.toml
+++ b/polkadot/zombienet-sdk-tests/Cargo.toml
@@ -8,16 +8,16 @@ license.workspace = true
 publish = false
 
 [dependencies]
+anyhow = { workspace = true }
+codec = { workspace = true, features = ["derive"] }
 env_logger = { workspace = true }
 log = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 subxt = { workspace = true, features = ["substrate-compat"] }
 subxt-signer = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread"] }
-anyhow = { workspace = true }
 zombienet-sdk = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-codec = { workspace = true, features = ["derive"] }
 
 [features]
 zombie-metadata = []
diff --git a/substrate/bin/node/bench/Cargo.toml b/substrate/bin/node/bench/Cargo.toml
index 447f947107c1b593eb62e0c4f200503d6864ffea..83f7b82cd2b51e755c4b9d9273a281db12a23ad7 100644
--- a/substrate/bin/node/bench/Cargo.toml
+++ b/substrate/bin/node/bench/Cargo.toml
@@ -15,33 +15,33 @@ workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-trait = { workspace = true }
 array-bytes = { workspace = true, default-features = true }
+async-trait = { workspace = true }
 clap = { features = ["derive"], workspace = true }
+derive_more = { features = ["display"], workspace = true }
+fs_extra = { workspace = true }
+futures = { features = ["thread-pool"], workspace = true }
+hash-db = { workspace = true, default-features = true }
+kitchensink-runtime = { workspace = true }
+kvdb = { workspace = true }
+kvdb-rocksdb = { workspace = true }
 log = { workspace = true, default-features = true }
 node-primitives = { workspace = true, default-features = true }
 node-testing = { workspace = true }
-kitchensink-runtime = { workspace = true }
+parity-db = { workspace = true }
+rand = { features = ["small_rng"], workspace = true, default-features = true }
+sc-basic-authorship = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
-sp-state-machine = { workspace = true, default-features = true }
+sc-transaction-pool = { workspace = true, default-features = true }
+sc-transaction-pool-api = { workspace = true, default-features = true }
 serde = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
-derive_more = { features = ["display"], workspace = true }
-kvdb = { workspace = true }
-kvdb-rocksdb = { workspace = true }
-sp-trie = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
-sc-basic-authorship = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-state-machine = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
-hash-db = { workspace = true, default-features = true }
+sp-trie = { workspace = true, default-features = true }
 tempfile = { workspace = true }
-fs_extra = { workspace = true }
-rand = { features = ["small_rng"], workspace = true, default-features = true }
-parity-db = { workspace = true }
-sc-transaction-pool = { workspace = true, default-features = true }
-sc-transaction-pool-api = { workspace = true, default-features = true }
-futures = { features = ["thread-pool"], workspace = true }
diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml
index c179579c1885359b04c6a74f9c86efaa285e19bd..9e063ee3cde0f231ea353691c4998eeeb4c3b744 100644
--- a/substrate/bin/node/cli/Cargo.toml
+++ b/substrate/bin/node/cli/Cargo.toml
@@ -40,11 +40,11 @@ crate-type = ["cdylib", "rlib"]
 array-bytes = { workspace = true, default-features = true }
 clap = { features = ["derive"], optional = true, workspace = true }
 codec = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-jsonrpsee = { features = ["server"], workspace = true }
 futures = { workspace = true }
+jsonrpsee = { features = ["server"], workspace = true }
 log = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
 subxt-signer = { workspace = true, features = ["unstable-eth"] }
 
@@ -135,32 +135,32 @@ polkadot-sdk = { features = [
 
 # Shared code between the staging node and kitchensink runtime:
 kitchensink-runtime = { workspace = true }
-node-rpc = { workspace = true }
-node-primitives = { workspace = true, default-features = true }
 node-inspect = { optional = true, workspace = true, default-features = true }
+node-primitives = { workspace = true, default-features = true }
+node-rpc = { workspace = true }
 
 [dev-dependencies]
-futures = { workspace = true }
-tempfile = { workspace = true }
 assert_cmd = { workspace = true }
+criterion = { features = ["async_tokio"], workspace = true, default-features = true }
+futures = { workspace = true }
 nix = { features = ["signal"], workspace = true }
-regex = { workspace = true }
 platforms = { workspace = true }
+pretty_assertions.workspace = true
+regex = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 soketto = { workspace = true }
-criterion = { features = ["async_tokio"], workspace = true, default-features = true }
+sp-keyring = { workspace = true }
+tempfile = { workspace = true }
 tokio = { features = ["macros", "parking_lot", "time"], workspace = true, default-features = true }
 tokio-util = { features = ["compat"], workspace = true }
 wait-timeout = { workspace = true }
 wat = { workspace = true }
-serde_json = { workspace = true, default-features = true }
-scale-info = { features = ["derive", "serde"], workspace = true, default-features = true }
-sp-keyring = { workspace = true }
-pretty_assertions.workspace = true
 
 # These testing-only dependencies are not exported by the Polkadot-SDK crate:
 node-testing = { workspace = true }
-substrate-cli-test-utils = { workspace = true }
 sc-service-test = { workspace = true }
+substrate-cli-test-utils = { workspace = true }
 
 [build-dependencies]
 clap = { optional = true, workspace = true }
diff --git a/substrate/bin/node/inspect/Cargo.toml b/substrate/bin/node/inspect/Cargo.toml
index 6c8a4e59f68d7e2c848463361755b51eeecac668..0cf13bef71f16113b8c127efac13b4cd1dfa0471 100644
--- a/substrate/bin/node/inspect/Cargo.toml
+++ b/substrate/bin/node/inspect/Cargo.toml
@@ -17,7 +17,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 clap = { features = ["derive"], workspace = true }
 codec = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 sc-cli = { workspace = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-service = { workspace = true }
@@ -26,6 +25,7 @@ sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-statement-store = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [features]
 runtime-benchmarks = [
diff --git a/substrate/bin/node/rpc/Cargo.toml b/substrate/bin/node/rpc/Cargo.toml
index 02f5d9a4a70258f1259042bbd1b6f3096c70725c..c8b20287650bde7c8fb2fda3dd527a6288495293 100644
--- a/substrate/bin/node/rpc/Cargo.toml
+++ b/substrate/bin/node/rpc/Cargo.toml
@@ -17,16 +17,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 jsonrpsee = { features = ["server"], workspace = true }
+mmr-rpc = { workspace = true, default-features = true }
 node-primitives = { workspace = true, default-features = true }
 pallet-transaction-payment-rpc = { workspace = true, default-features = true }
-mmr-rpc = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus-babe = { workspace = true, default-features = true }
 sc-consensus-babe-rpc = { workspace = true, default-features = true }
 sc-consensus-beefy = { workspace = true, default-features = true }
 sc-consensus-beefy-rpc = { workspace = true, default-features = true }
-sp-consensus-beefy = { workspace = true, default-features = true }
 sc-consensus-grandpa = { workspace = true, default-features = true }
 sc-consensus-grandpa-rpc = { workspace = true, default-features = true }
 sc-mixnet = { workspace = true, default-features = true }
@@ -34,13 +33,14 @@ sc-rpc = { workspace = true, default-features = true }
 sc-sync-state-rpc = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
+sp-application-crypto = { workspace = true, default-features = true }
 sp-block-builder = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-consensus-babe = { workspace = true, default-features = true }
+sp-consensus-beefy = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true, default-features = true }
 sp-statement-store = { workspace = true, default-features = true }
 substrate-frame-rpc-system = { workspace = true, default-features = true }
 substrate-state-trie-migration-rpc = { workspace = true, default-features = true }
diff --git a/substrate/bin/node/runtime/Cargo.toml b/substrate/bin/node/runtime/Cargo.toml
index 3ad6315561d0aab36f94cb841eb639165ac54acc..6d377cc92cce1ec1aae3ee07ef2f2b7c319ee97b 100644
--- a/substrate/bin/node/runtime/Cargo.toml
+++ b/substrate/bin/node/runtime/Cargo.toml
@@ -23,11 +23,11 @@ codec = { features = [
 	"derive",
 	"max-encoded-len",
 ], workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
-static_assertions = { workspace = true, default-features = true }
 log = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
 serde_json = { features = ["alloc", "arbitrary_precision"], workspace = true }
 sp-debug-derive = { workspace = true, features = ["force-debug"] }
+static_assertions = { workspace = true, default-features = true }
 
 # pallet-asset-conversion: turn on "num-traits" feature
 primitive-types = { features = ["codec", "num-traits", "scale-info"], workspace = true }
diff --git a/substrate/bin/node/testing/Cargo.toml b/substrate/bin/node/testing/Cargo.toml
index 1972c03a368b5c8202badcd0a7d14916049f4315..13477a172fb8b01d9ba7f9cf266c639a16da8110 100644
--- a/substrate/bin/node/testing/Cargo.toml
+++ b/substrate/bin/node/testing/Cargo.toml
@@ -17,20 +17,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true, default-features = true }
+frame-metadata-hash-extension = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 fs_extra = { workspace = true }
 futures = { workspace = true }
+kitchensink-runtime = { workspace = true }
 log = { workspace = true, default-features = true }
-tempfile = { workspace = true }
-frame-metadata-hash-extension = { workspace = true, default-features = true }
-frame-system = { workspace = true, default-features = true }
 node-cli = { workspace = true }
 node-primitives = { workspace = true, default-features = true }
-kitchensink-runtime = { workspace = true }
 pallet-asset-conversion = { workspace = true, default-features = true }
-pallet-assets = { workspace = true, default-features = true }
-pallet-revive = { workspace = true, default-features = true }
 pallet-asset-conversion-tx-payment = { workspace = true, default-features = true }
 pallet-asset-tx-payment = { workspace = true, default-features = true }
+pallet-assets = { workspace = true, default-features = true }
+pallet-revive = { workspace = true, default-features = true }
 pallet-skip-feeless-payment = { workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
@@ -50,3 +49,4 @@ sp-keyring = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true }
 substrate-test-client = { workspace = true }
+tempfile = { workspace = true }
diff --git a/substrate/bin/utils/chain-spec-builder/Cargo.toml b/substrate/bin/utils/chain-spec-builder/Cargo.toml
index b71e935a918f2e52a5a8324b011ec6891c68a510..f3adc568296955619f11b9dfddc4c50e3b2ff13a 100644
--- a/substrate/bin/utils/chain-spec-builder/Cargo.toml
+++ b/substrate/bin/utils/chain-spec-builder/Cargo.toml
@@ -34,14 +34,14 @@ log = { workspace = true, default-features = true }
 sc-chain-spec = { features = [
 	"clap",
 ], workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
 serde = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 
 [dev-dependencies]
-substrate-test-runtime = { workspace = true }
 cmd_lib = { workspace = true }
 docify = { workspace = true }
+substrate-test-runtime = { workspace = true }
 
 [features]
 # `cargo build --feature=generate-readme` updates the `README.md` file.
diff --git a/substrate/client/allocator/Cargo.toml b/substrate/client/allocator/Cargo.toml
index a8b3bdc864c9ae2ce1e10a3e24bd4d5255058522..c0ce640566b07501c66e4b29c84b749ed04ce443 100644
--- a/substrate/client/allocator/Cargo.toml
+++ b/substrate/client/allocator/Cargo.toml
@@ -18,6 +18,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 sp-core = { workspace = true, default-features = true }
 sp-wasm-interface = { workspace = true, default-features = true }
+thiserror = { workspace = true }
diff --git a/substrate/client/api/Cargo.toml b/substrate/client/api/Cargo.toml
index 670c746844672cc531174c18ad2ede216df0ba44..fe961b4690fc69950baca77e9344e669c620ac90 100644
--- a/substrate/client/api/Cargo.toml
+++ b/substrate/client/api/Cargo.toml
@@ -41,6 +41,6 @@ sp-storage = { workspace = true, default-features = true }
 sp-trie = { workspace = true, default-features = true }
 
 [dev-dependencies]
-thiserror = { workspace = true }
 sp-test-primitives = { workspace = true }
 substrate-test-runtime = { workspace = true }
+thiserror = { workspace = true }
diff --git a/substrate/client/authority-discovery/Cargo.toml b/substrate/client/authority-discovery/Cargo.toml
index fc88d07ef936e46d28c278924fbdea5c45b45141..ac1891451ec0d93b37264909659b4e03d0b007d1 100644
--- a/substrate/client/authority-discovery/Cargo.toml
+++ b/substrate/client/authority-discovery/Cargo.toml
@@ -20,17 +20,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 prost-build = { workspace = true }
 
 [dependencies]
+async-trait = { workspace = true }
 codec = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 ip_network = { workspace = true }
-multihash = { workspace = true }
 linked_hash_set = { workspace = true }
 log = { workspace = true, default-features = true }
+multihash = { workspace = true }
+prometheus-endpoint = { workspace = true, default-features = true }
 prost = { workspace = true }
 rand = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
@@ -40,7 +40,7 @@ sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-async-trait = { workspace = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 quickcheck = { workspace = true }
diff --git a/substrate/client/block-builder/Cargo.toml b/substrate/client/block-builder/Cargo.toml
index 08392e18227f93a2fec12ee7796433c68d4122c8..c61a5a7ad3c1940b34db6b16b01568cbd0d2e595 100644
--- a/substrate/client/block-builder/Cargo.toml
+++ b/substrate/client/block-builder/Cargo.toml
@@ -23,9 +23,9 @@ sp-api = { workspace = true, default-features = true }
 sp-block-builder = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-sp-trie = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+sp-trie = { workspace = true, default-features = true }
 
 [dev-dependencies]
 sp-state-machine = { workspace = true, default-features = true }
diff --git a/substrate/client/chain-spec/Cargo.toml b/substrate/client/chain-spec/Cargo.toml
index 2e885240936fe94fcdd408a56e512eec2cf46f5a..f63ff6c64447893a26fb1614cd374581b62615ab 100644
--- a/substrate/client/chain-spec/Cargo.toml
+++ b/substrate/client/chain-spec/Cargo.toml
@@ -16,31 +16,31 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+array-bytes = { workspace = true, default-features = true }
 clap = { features = ["derive"], optional = true, workspace = true }
 codec = { features = ["derive"], workspace = true }
+docify = { workspace = true }
+log = { workspace = true }
 memmap2 = { workspace = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
 sc-chain-spec-derive = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
-sp-io = { workspace = true }
 sc-network = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
 sp-genesis-builder = { workspace = true, default-features = true }
+sp-io = { workspace = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
-log = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
-array-bytes = { workspace = true, default-features = true }
-docify = { workspace = true }
 
 [dev-dependencies]
-substrate-test-runtime = { workspace = true }
-sp-keyring = { workspace = true, default-features = true }
+regex = { workspace = true }
 sp-application-crypto = { features = ["serde"], workspace = true }
 sp-consensus-babe = { features = ["serde"], workspace = true }
-regex = { workspace = true }
+sp-keyring = { workspace = true, default-features = true }
+substrate-test-runtime = { workspace = true }
diff --git a/substrate/client/cli/Cargo.toml b/substrate/client/cli/Cargo.toml
index f0b9f8f9b9051587eb11d626b79e9c5d2b76fe09..d7b4489b6cc5f842106bbfaea73daaeea77f0268 100644
--- a/substrate/client/cli/Cargo.toml
+++ b/substrate/client/cli/Cargo.toml
@@ -19,13 +19,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 array-bytes = { workspace = true, default-features = true }
 chrono = { workspace = true }
 clap = { features = ["derive", "string", "wrap_help"], workspace = true }
+codec = { workspace = true, default-features = true }
 fdlimit = { workspace = true }
 futures = { workspace = true }
 itertools = { workspace = true }
 libp2p-identity = { features = ["ed25519", "peerid"], workspace = true }
 log = { workspace = true, default-features = true }
 names = { workspace = true }
-codec = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
 regex = { workspace = true }
 rpassword = { workspace = true }
@@ -34,7 +34,6 @@ serde_json = { workspace = true, default-features = true }
 thiserror = { workspace = true }
 # personal fork here as workaround for: https://github.com/rust-bitcoin/rust-bip39/pull/64
 bip39 = { package = "parity-bip39", version = "2.0.1", features = ["rand"] }
-tokio = { features = ["parking_lot", "rt-multi-thread", "signal"], workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-client-db = { workspace = true }
 sc-keystore = { workspace = true, default-features = true }
@@ -52,11 +51,12 @@ sp-keystore = { workspace = true, default-features = true }
 sp-panic-handler = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
+tokio = { features = ["parking_lot", "rt-multi-thread", "signal"], workspace = true, default-features = true }
 
 [dev-dependencies]
-tempfile = { workspace = true }
 futures-timer = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
+tempfile = { workspace = true }
 
 [features]
 default = ["rocksdb"]
diff --git a/substrate/client/consensus/aura/Cargo.toml b/substrate/client/consensus/aura/Cargo.toml
index 98e8ad676be3c9b64aafdc96b08434c0462de62c..6af6736171182230c101cd05514dc9aaa94e4ab3 100644
--- a/substrate/client/consensus/aura/Cargo.toml
+++ b/substrate/client/consensus/aura/Cargo.toml
@@ -20,7 +20,6 @@ async-trait = { workspace = true }
 codec = { workspace = true, default-features = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
@@ -38,10 +37,10 @@ sp-core = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 parking_lot = { workspace = true, default-features = true }
-tempfile = { workspace = true }
 sc-keystore = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-test = { workspace = true }
@@ -49,4 +48,5 @@ sp-keyring = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
+tempfile = { workspace = true }
 tokio = { workspace = true, default-features = true }
diff --git a/substrate/client/consensus/babe/Cargo.toml b/substrate/client/consensus/babe/Cargo.toml
index af55e72a9b7eed54a956f2c283c06fab0b494294..305409b80c787af832484a182add01b7ecf27a30 100644
--- a/substrate/client/consensus/babe/Cargo.toml
+++ b/substrate/client/consensus/babe/Cargo.toml
@@ -19,14 +19,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 async-trait = { workspace = true }
 codec = { features = ["derive"], workspace = true, default-features = true }
+fork-tree = { workspace = true, default-features = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
 num-bigint = { workspace = true }
 num-rational = { workspace = true }
 num-traits = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-fork-tree = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
@@ -46,11 +45,12 @@ sp-crypto-hashing = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 sc-block-builder = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
 sc-network-test = { workspace = true }
+sp-keyring = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
diff --git a/substrate/client/consensus/babe/rpc/Cargo.toml b/substrate/client/consensus/babe/rpc/Cargo.toml
index ce5b1baec0b57700b5831a5d86eabd62a841c237..3e383418993873cd2cb5994bdeb1d70eb500ac81 100644
--- a/substrate/client/consensus/babe/rpc/Cargo.toml
+++ b/substrate/client/consensus/babe/rpc/Cargo.toml
@@ -16,13 +16,12 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
 futures = { workspace = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-thiserror = { workspace = true }
+jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
 sc-consensus-babe = { workspace = true, default-features = true }
 sc-consensus-epochs = { workspace = true, default-features = true }
 sc-rpc-api = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
@@ -31,12 +30,13 @@ sp-consensus-babe = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-serde_json = { workspace = true, default-features = true }
-tokio = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-keystore = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
+tokio = { workspace = true, default-features = true }
diff --git a/substrate/client/consensus/beefy/Cargo.toml b/substrate/client/consensus/beefy/Cargo.toml
index 900a44b95e0442159c3efb42965cc256d5998e9c..bfe7e2c3d5dc5c983c3521f337602a57a7d1b1b1 100644
--- a/substrate/client/consensus/beefy/Cargo.toml
+++ b/substrate/client/consensus/beefy/Cargo.toml
@@ -20,8 +20,6 @@ fnv = { workspace = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-wasm-timer = { workspace = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
@@ -40,18 +38,20 @@ sp-core = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 tokio = { workspace = true, default-features = true }
+wasm-timer = { workspace = true }
 
 [dev-dependencies]
-serde = { workspace = true, default-features = true }
-tempfile = { workspace = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-network-test = { workspace = true }
+serde = { workspace = true, default-features = true }
 sp-consensus-grandpa = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 sp-mmr-primitives = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
+tempfile = { workspace = true }
 
 [features]
 # This feature adds BLS crypto primitives. It should not be used in production since
diff --git a/substrate/client/consensus/beefy/rpc/Cargo.toml b/substrate/client/consensus/beefy/rpc/Cargo.toml
index e1956dacf396125c8b7a08a2e43da5d6b75b43b7..f8f24250ad93d1c1bbcfc92173e24ccac5a59293 100644
--- a/substrate/client/consensus/beefy/rpc/Cargo.toml
+++ b/substrate/client/consensus/beefy/rpc/Cargo.toml
@@ -17,17 +17,17 @@ futures = { workspace = true }
 jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
 log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-thiserror = { workspace = true }
 sc-consensus-beefy = { workspace = true, default-features = true }
-sp-consensus-beefy = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
+sp-application-crypto = { workspace = true, default-features = true }
+sp-consensus-beefy = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-application-crypto = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-serde_json = { workspace = true, default-features = true }
 sc-rpc = { features = ["test-helpers"], workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
 tokio = { features = ["macros"], workspace = true, default-features = true }
diff --git a/substrate/client/consensus/common/Cargo.toml b/substrate/client/consensus/common/Cargo.toml
index 77cd50ad784bb5e055480466036e573b9ec7cbc8..1b0f799f81bca89fe4fee6025e7f64b5014dbe83 100644
--- a/substrate/client/consensus/common/Cargo.toml
+++ b/substrate/client/consensus/common/Cargo.toml
@@ -21,18 +21,18 @@ futures = { features = ["thread-pool"], workspace = true }
 log = { workspace = true, default-features = true }
 mockall = { workspace = true }
 parking_lot = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-thiserror = { workspace = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 sp-test-primitives = { workspace = true }
diff --git a/substrate/client/consensus/grandpa/Cargo.toml b/substrate/client/consensus/grandpa/Cargo.toml
index 65ba39d34c214014c0a2f29e67fbe211e4763b25..f361fac54af71e637de58591c64f3f3865552077 100644
--- a/substrate/client/consensus/grandpa/Cargo.toml
+++ b/substrate/client/consensus/grandpa/Cargo.toml
@@ -20,48 +20,48 @@ targets = ["x86_64-unknown-linux-gnu"]
 ahash = { workspace = true }
 array-bytes = { workspace = true, default-features = true }
 async-trait = { workspace = true }
+codec = { features = ["derive"], workspace = true, default-features = true }
 dyn-clone = { workspace = true }
 finality-grandpa = { features = ["derive-codec"], workspace = true, default-features = true }
+fork-tree = { workspace = true, default-features = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 log = { workspace = true, default-features = true }
-codec = { features = ["derive"], workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-rand = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-fork-tree = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
+rand = { workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
-sc-transaction-pool-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
-sc-network-gossip = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
+sc-network-gossip = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
+sc-transaction-pool-api = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
 sp-arithmetic = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
+sp-consensus-grandpa = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
-sp-consensus-grandpa = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
 finality-grandpa = { features = ["derive-codec", "test-helpers"], workspace = true, default-features = true }
-serde = { workspace = true, default-features = true }
-tokio = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-test = { workspace = true }
+serde = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
+tokio = { workspace = true, default-features = true }
diff --git a/substrate/client/consensus/grandpa/rpc/Cargo.toml b/substrate/client/consensus/grandpa/rpc/Cargo.toml
index 86513ac5df153f600f898bffa88513bd19d263e4..1fb8bd9367c4f715cdbe717d0028d87b2e480fab 100644
--- a/substrate/client/consensus/grandpa/rpc/Cargo.toml
+++ b/substrate/client/consensus/grandpa/rpc/Cargo.toml
@@ -13,25 +13,25 @@ homepage.workspace = true
 workspace = true
 
 [dependencies]
+codec = { features = ["derive"], workspace = true, default-features = true }
 finality-grandpa = { features = ["derive-codec"], workspace = true, default-features = true }
 futures = { workspace = true }
 jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
 log = { workspace = true, default-features = true }
-codec = { features = ["derive"], workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-thiserror = { workspace = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus-grandpa = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 sc-block-builder = { workspace = true, default-features = true }
 sc-rpc = { features = ["test-helpers"], workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 sp-consensus-grandpa = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
 tokio = { features = ["macros"], workspace = true, default-features = true }
diff --git a/substrate/client/consensus/manual-seal/Cargo.toml b/substrate/client/consensus/manual-seal/Cargo.toml
index 49111434015af9cbba80a091102259a781972853..4d232f7256cb7e27e82a8ec730860c3525f7108a 100644
--- a/substrate/client/consensus/manual-seal/Cargo.toml
+++ b/substrate/client/consensus/manual-seal/Cargo.toml
@@ -16,15 +16,13 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
 assert_matches = { workspace = true }
 async-trait = { workspace = true }
 codec = { workspace = true, default-features = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
+jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
 log = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-thiserror = { workspace = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
@@ -33,6 +31,7 @@ sc-consensus-babe = { workspace = true, default-features = true }
 sc-consensus-epochs = { workspace = true, default-features = true }
 sc-transaction-pool = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
@@ -44,9 +43,10 @@ sp-inherents = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-timestamp = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
-tokio = { features = ["macros", "rt-multi-thread"], workspace = true, default-features = true }
 sc-basic-authorship = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
 substrate-test-runtime-transaction-pool = { workspace = true }
+tokio = { features = ["macros", "rt-multi-thread"], workspace = true, default-features = true }
diff --git a/substrate/client/consensus/pow/Cargo.toml b/substrate/client/consensus/pow/Cargo.toml
index bc89deb0b50d60d2872cc73aba7705f360b53381..a051bf3f47794346000c7f5b82c920db7abcbf78 100644
--- a/substrate/client/consensus/pow/Cargo.toml
+++ b/substrate/client/consensus/pow/Cargo.toml
@@ -22,7 +22,6 @@ futures = { workspace = true }
 futures-timer = { workspace = true }
 log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
@@ -34,3 +33,4 @@ sp-consensus-pow = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
diff --git a/substrate/client/db/Cargo.toml b/substrate/client/db/Cargo.toml
index 5725155579fc70450afad9ff46580afc721d2ea0..7e02558e007c8bb901af7dc69389dec68e63cd51 100644
--- a/substrate/client/db/Cargo.toml
+++ b/substrate/client/db/Cargo.toml
@@ -39,15 +39,15 @@ sp-state-machine = { workspace = true, default-features = true }
 sp-trie = { workspace = true, default-features = true }
 
 [dev-dependencies]
+array-bytes = { workspace = true, default-features = true }
 criterion = { workspace = true, default-features = true }
+kitchensink-runtime = { workspace = true }
 kvdb-rocksdb = { workspace = true }
-rand = { workspace = true, default-features = true }
-tempfile = { workspace = true }
 quickcheck = { workspace = true }
-kitchensink-runtime = { workspace = true }
+rand = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
-array-bytes = { workspace = true, default-features = true }
+tempfile = { workspace = true }
 
 [features]
 default = []
diff --git a/substrate/client/executor/Cargo.toml b/substrate/client/executor/Cargo.toml
index ca78afd470681227c07a2fad61bcc5b945d01e94..5cb4936e7534ac9986fa196f2e12009fb0c1a323 100644
--- a/substrate/client/executor/Cargo.toml
+++ b/substrate/client/executor/Cargo.toml
@@ -38,21 +38,21 @@ sp-wasm-interface = { workspace = true, default-features = true }
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
-wat = { workspace = true }
+criterion = { workspace = true, default-features = true }
+num_cpus = { workspace = true }
+paste = { workspace = true, default-features = true }
+regex = { workspace = true }
 sc-runtime-test = { workspace = true }
-substrate-test-runtime = { workspace = true }
+sc-tracing = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
-sp-state-machine = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 sp-maybe-compressed-blob = { workspace = true, default-features = true }
-sc-tracing = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-state-machine = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-tracing-subscriber = { workspace = true }
-paste = { workspace = true, default-features = true }
-regex = { workspace = true }
-criterion = { workspace = true, default-features = true }
-num_cpus = { workspace = true }
+substrate-test-runtime = { workspace = true }
 tempfile = { workspace = true }
+tracing-subscriber = { workspace = true }
+wat = { workspace = true }
 
 [[bench]]
 name = "bench"
diff --git a/substrate/client/executor/common/Cargo.toml b/substrate/client/executor/common/Cargo.toml
index 58fb0b423f24235a0ddd277b3feaca5c193482d2..aaf13a8ae768808eb1da9f951dbbc79d9690c4e6 100644
--- a/substrate/client/executor/common/Cargo.toml
+++ b/substrate/client/executor/common/Cargo.toml
@@ -17,12 +17,12 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-thiserror = { workspace = true }
-wasm-instrument = { workspace = true, default-features = true }
+polkavm = { workspace = true }
 sc-allocator = { workspace = true, default-features = true }
 sp-maybe-compressed-blob = { workspace = true, default-features = true }
 sp-wasm-interface = { workspace = true, default-features = true }
-polkavm = { workspace = true }
+thiserror = { workspace = true }
+wasm-instrument = { workspace = true, default-features = true }
 
 [features]
 default = []
diff --git a/substrate/client/executor/wasmtime/Cargo.toml b/substrate/client/executor/wasmtime/Cargo.toml
index ef8e5da876aa606e32790e9e8eb0ffb077ce2174..7ea94568e1b7f89f725c35d52e1e9c94ee370392 100644
--- a/substrate/client/executor/wasmtime/Cargo.toml
+++ b/substrate/client/executor/wasmtime/Cargo.toml
@@ -16,13 +16,18 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-log = { workspace = true, default-features = true }
 cfg-if = { workspace = true }
 libc = { workspace = true }
+log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
 
 # When bumping wasmtime do not forget to also bump rustix
 # to exactly the same version as used by wasmtime!
+anyhow = { workspace = true }
+sc-allocator = { workspace = true, default-features = true }
+sc-executor-common = { workspace = true, default-features = true }
+sp-runtime-interface = { workspace = true, default-features = true }
+sp-wasm-interface = { features = ["wasmtime"], workspace = true, default-features = true }
 wasmtime = { features = [
 	"cache",
 	"cranelift",
@@ -30,11 +35,6 @@ wasmtime = { features = [
 	"parallel-compilation",
 	"pooling-allocator",
 ], workspace = true }
-anyhow = { workspace = true }
-sc-allocator = { workspace = true, default-features = true }
-sc-executor-common = { workspace = true, default-features = true }
-sp-runtime-interface = { workspace = true, default-features = true }
-sp-wasm-interface = { features = ["wasmtime"], workspace = true, default-features = true }
 
 # Here we include the rustix crate in the exactly same semver-compatible version as used by
 # wasmtime and enable its 'use-libc' flag.
@@ -45,10 +45,10 @@ sp-wasm-interface = { features = ["wasmtime"], workspace = true, default-feature
 rustix = { features = ["fs", "mm", "param", "std", "use-libc"], workspace = true }
 
 [dev-dependencies]
-wat = { workspace = true }
+cargo_metadata = { workspace = true }
+codec = { workspace = true, default-features = true }
+paste = { workspace = true, default-features = true }
 sc-runtime-test = { workspace = true }
 sp-io = { workspace = true, default-features = true }
 tempfile = { workspace = true }
-paste = { workspace = true, default-features = true }
-codec = { workspace = true, default-features = true }
-cargo_metadata = { workspace = true }
+wat = { workspace = true }
diff --git a/substrate/client/informant/Cargo.toml b/substrate/client/informant/Cargo.toml
index 87a4be320d689d984f0b8ac94c12f78fda84eaa8..209964e02ef38bcb2723b4193d01f3ab2b8f2463 100644
--- a/substrate/client/informant/Cargo.toml
+++ b/substrate/client/informant/Cargo.toml
@@ -21,8 +21,8 @@ futures = { workspace = true }
 futures-timer = { workspace = true }
 log = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
diff --git a/substrate/client/keystore/Cargo.toml b/substrate/client/keystore/Cargo.toml
index d338bb1af61acfb39cde2213703247877bc067ad..e46fafbc3729c52483fa2633abe148fd66948e08 100644
--- a/substrate/client/keystore/Cargo.toml
+++ b/substrate/client/keystore/Cargo.toml
@@ -20,10 +20,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 array-bytes = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 sp-application-crypto = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 tempfile = { workspace = true }
diff --git a/substrate/client/merkle-mountain-range/Cargo.toml b/substrate/client/merkle-mountain-range/Cargo.toml
index 6639a10d33f10650ec35f8a4984df25bb3333a0c..7849eac5f5167a2a856750543cf75badb323fdf9 100644
--- a/substrate/client/merkle-mountain-range/Cargo.toml
+++ b/substrate/client/merkle-mountain-range/Cargo.toml
@@ -17,14 +17,14 @@ workspace = true
 codec = { workspace = true, default-features = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
+sc-offchain = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-sp-consensus-beefy = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
+sp-consensus-beefy = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-mmr-primitives = { workspace = true, default-features = true }
-sc-offchain = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 
 [dev-dependencies]
diff --git a/substrate/client/network-gossip/Cargo.toml b/substrate/client/network-gossip/Cargo.toml
index 94bc9a671f84b93912df606d313ca7416b673188..ea52913aea1608219019c080bffa6ecb12f7ecab 100644
--- a/substrate/client/network-gossip/Cargo.toml
+++ b/substrate/client/network-gossip/Cargo.toml
@@ -21,18 +21,18 @@ ahash = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 log = { workspace = true, default-features = true }
-schnellru = { workspace = true }
-tracing = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
+schnellru = { workspace = true }
 sp-runtime = { workspace = true, default-features = true }
+tracing = { workspace = true, default-features = true }
 
 [dev-dependencies]
-tokio = { workspace = true, default-features = true }
 async-trait = { workspace = true }
 codec = { features = ["derive"], workspace = true, default-features = true }
 quickcheck = { workspace = true }
 substrate-test-runtime-client = { workspace = true }
+tokio = { workspace = true, default-features = true }
diff --git a/substrate/client/network/Cargo.toml b/substrate/client/network/Cargo.toml
index c8fd28e0810943a898c14ba25cad618f372769c2..19af70867658c7c37b982a25fb0891ff104003ca 100644
--- a/substrate/client/network/Cargo.toml
+++ b/substrate/client/network/Cargo.toml
@@ -34,54 +34,54 @@ futures-timer = { workspace = true }
 ip_network = { workspace = true }
 libp2p = { features = ["dns", "identify", "kad", "macros", "mdns", "noise", "ping", "request-response", "tcp", "tokio", "websocket", "yamux"], workspace = true }
 linked_hash_set = { workspace = true }
+litep2p = { workspace = true }
 log = { workspace = true, default-features = true }
 mockall = { workspace = true }
+once_cell = { workspace = true }
 parking_lot = { workspace = true, default-features = true }
 partial_sort = { workspace = true }
 pin-project = { workspace = true }
-rand = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-smallvec = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-tokio = { features = ["macros", "sync"], workspace = true, default-features = true }
-tokio-stream = { workspace = true }
-unsigned-varint = { features = ["asynchronous_codec", "futures"], workspace = true }
-zeroize = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 prost = { workspace = true }
+rand = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
+schnellru = { workspace = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
+smallvec = { workspace = true, default-features = true }
 sp-arithmetic = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-wasm-timer = { workspace = true }
-litep2p = { workspace = true }
-once_cell = { workspace = true }
+thiserror = { workspace = true }
+tokio = { features = ["macros", "sync"], workspace = true, default-features = true }
+tokio-stream = { workspace = true }
+unsigned-varint = { features = ["asynchronous_codec", "futures"], workspace = true }
 void = { workspace = true }
-schnellru = { workspace = true }
+wasm-timer = { workspace = true }
+zeroize = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
 mockall = { workspace = true }
 multistream-select = { workspace = true }
 rand = { workspace = true, default-features = true }
-tempfile = { workspace = true }
-tokio = { features = ["macros", "rt-multi-thread"], workspace = true, default-features = true }
-tokio-util = { features = ["compat"], workspace = true }
-tokio-test = { workspace = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-network-light = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
-sp-crypto-hashing = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
+sp-crypto-hashing = { workspace = true, default-features = true }
 sp-test-primitives = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime = { workspace = true }
 substrate-test-runtime-client = { workspace = true }
+tempfile = { workspace = true }
+tokio = { features = ["macros", "rt-multi-thread"], workspace = true, default-features = true }
+tokio-test = { workspace = true }
+tokio-util = { features = ["compat"], workspace = true }
 
 criterion = { workspace = true, default-features = true, features = ["async_tokio"] }
 sc-consensus = { workspace = true, default-features = true }
diff --git a/substrate/client/network/light/Cargo.toml b/substrate/client/network/light/Cargo.toml
index 34ba4f061c44f4e75ead7838d3e335ab11d923e1..fad7ae42585842dfc75ae690d88e5805eb616cf9 100644
--- a/substrate/client/network/light/Cargo.toml
+++ b/substrate/client/network/light/Cargo.toml
@@ -19,18 +19,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 prost-build = { workspace = true }
 
 [dependencies]
-async-channel = { workspace = true }
 array-bytes = { workspace = true, default-features = true }
+async-channel = { workspace = true }
 codec = { features = [
 	"derive",
 ], workspace = true, default-features = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
 prost = { workspace = true }
-sp-blockchain = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
-sc-network-types = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
+sc-network-types = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 thiserror = { workspace = true }
diff --git a/substrate/client/network/statement/Cargo.toml b/substrate/client/network/statement/Cargo.toml
index 43933f066edd279353cbee883346af938ab2c114..dd3a8bef8a2f61600a8fced575008800e6671eea 100644
--- a/substrate/client/network/statement/Cargo.toml
+++ b/substrate/client/network/statement/Cargo.toml
@@ -22,10 +22,10 @@ codec = { features = ["derive"], workspace = true, default-features = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-statement-store = { workspace = true, default-features = true }
diff --git a/substrate/client/network/sync/Cargo.toml b/substrate/client/network/sync/Cargo.toml
index 378b7c12e9b75f46c798f5f1cc5da1c571db3d0d..fdc290a2d01e85cf3a81a16835564d8d4184998c 100644
--- a/substrate/client/network/sync/Cargo.toml
+++ b/substrate/client/network/sync/Cargo.toml
@@ -23,30 +23,30 @@ array-bytes = { workspace = true, default-features = true }
 async-channel = { workspace = true }
 async-trait = { workspace = true }
 codec = { features = ["derive"], workspace = true, default-features = true }
+fork-tree = { workspace = true, default-features = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
 log = { workspace = true, default-features = true }
 mockall = { workspace = true }
-prost = { workspace = true }
-schnellru = { workspace = true }
-smallvec = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-tokio-stream = { workspace = true }
-tokio = { features = ["macros", "time"], workspace = true, default-features = true }
-fork-tree = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
+prost = { workspace = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
+schnellru = { workspace = true }
+smallvec = { workspace = true, default-features = true }
 sp-arithmetic = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 sp-consensus-grandpa = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
+tokio = { features = ["macros", "time"], workspace = true, default-features = true }
+tokio-stream = { workspace = true }
 
 [dev-dependencies]
 mockall = { workspace = true }
diff --git a/substrate/client/network/test/Cargo.toml b/substrate/client/network/test/Cargo.toml
index 6340d1dfb2f423c28cf411833502f8c8921b6c17..783d47f21fa76eee2431796c2cf3d5e0e92bd2db 100644
--- a/substrate/client/network/test/Cargo.toml
+++ b/substrate/client/network/test/Cargo.toml
@@ -16,7 +16,6 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-tokio = { workspace = true, default-features = true }
 async-trait = { workspace = true }
 futures = { workspace = true }
 futures-timer = { workspace = true }
@@ -29,11 +28,11 @@ sc-client-api = { workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
-sc-network-types = { workspace = true, default-features = true }
-sc-utils = { workspace = true, default-features = true }
 sc-network-light = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
+sc-network-types = { workspace = true, default-features = true }
 sc-service = { workspace = true }
+sc-utils = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
@@ -41,3 +40,4 @@ sp-runtime = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime = { workspace = true }
 substrate-test-runtime-client = { workspace = true }
+tokio = { workspace = true, default-features = true }
diff --git a/substrate/client/network/transactions/Cargo.toml b/substrate/client/network/transactions/Cargo.toml
index 2ffd6f5f466005ffe829874a74173efb7cb697d4..ef9ea1c46197061bb82c8034038947f844a7b2a6 100644
--- a/substrate/client/network/transactions/Cargo.toml
+++ b/substrate/client/network/transactions/Cargo.toml
@@ -26,5 +26,5 @@ sc-network-common = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
 sc-network-types = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
diff --git a/substrate/client/offchain/Cargo.toml b/substrate/client/offchain/Cargo.toml
index 71b40211e1263e7ad808e7037191fee26a0e4909..bfdb29cc4c351a227b0eaa484d516b2ebe7ed311 100644
--- a/substrate/client/offchain/Cargo.toml
+++ b/substrate/client/offchain/Cargo.toml
@@ -26,13 +26,12 @@ http-body-util = { workspace = true }
 hyper = { features = ["http1", "http2"], workspace = true, default-features = true }
 hyper-rustls = { workspace = true }
 hyper-util = { features = ["client-legacy", "http1", "http2"], workspace = true }
+log = { workspace = true, default-features = true }
 num_cpus = { workspace = true }
 once_cell = { workspace = true }
 parking_lot = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
 rustls = { workspace = true }
-threadpool = { workspace = true }
-tracing = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
@@ -41,15 +40,15 @@ sc-transaction-pool-api = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+sp-externalities = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
 sp-offchain = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-externalities = { workspace = true, default-features = true }
-log = { workspace = true, default-features = true }
+threadpool = { workspace = true }
+tracing = { workspace = true, default-features = true }
 
 [dev-dependencies]
 async-trait = { workspace = true }
-tokio = { workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-client-db = { default-features = true, workspace = true }
 sc-transaction-pool = { workspace = true, default-features = true }
@@ -57,6 +56,7 @@ sc-transaction-pool-api = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
+tokio = { workspace = true, default-features = true }
 
 [features]
 default = []
diff --git a/substrate/client/rpc-api/Cargo.toml b/substrate/client/rpc-api/Cargo.toml
index 3263285aa2b111ece735305c20eaa6661f37cca7..e7bb723d8839839a60a3d3741e8a04e7e27e61e1 100644
--- a/substrate/client/rpc-api/Cargo.toml
+++ b/substrate/client/rpc-api/Cargo.toml
@@ -17,15 +17,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true, default-features = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-thiserror = { workspace = true }
+jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
 sc-chain-spec = { workspace = true, default-features = true }
 sc-mixnet = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-rpc = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
-jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
+thiserror = { workspace = true }
diff --git a/substrate/client/rpc-spec-v2/Cargo.toml b/substrate/client/rpc-spec-v2/Cargo.toml
index 70f68436767f0acc7062008ee790637e529f815f..ebe7e7eca7b4fd1f9eeb72284975008fd2b5a178 100644
--- a/substrate/client/rpc-spec-v2/Cargo.toml
+++ b/substrate/client/rpc-spec-v2/Cargo.toml
@@ -20,45 +20,45 @@ jsonrpsee = { workspace = true, features = ["client-core", "macros", "server-cor
 # Internal chain structures for "chain_spec".
 sc-chain-spec = { workspace = true, default-features = true }
 # Pool for submitting extrinsics required by "transaction"
+array-bytes = { workspace = true, default-features = true }
+codec = { workspace = true, default-features = true }
+futures = { workspace = true }
+futures-util = { workspace = true }
+hex = { workspace = true, default-features = true }
+itertools = { workspace = true }
+log = { workspace = true, default-features = true }
+parking_lot = { workspace = true, default-features = true }
+rand = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
+sc-rpc = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
+schnellru = { workspace = true }
+serde = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
-sp-rpc = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-rpc = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-sc-rpc = { workspace = true, default-features = true }
-codec = { workspace = true, default-features = true }
 thiserror = { workspace = true }
-serde = { workspace = true, default-features = true }
-hex = { workspace = true, default-features = true }
-futures = { workspace = true }
-parking_lot = { workspace = true, default-features = true }
-tokio-stream = { features = ["sync"], workspace = true }
 tokio = { features = ["sync"], workspace = true, default-features = true }
-array-bytes = { workspace = true, default-features = true }
-log = { workspace = true, default-features = true }
-futures-util = { workspace = true }
-rand = { workspace = true, default-features = true }
-schnellru = { workspace = true }
-itertools = { workspace = true }
+tokio-stream = { features = ["sync"], workspace = true }
 
 [dev-dependencies]
+assert_matches = { workspace = true }
 async-trait = { workspace = true }
 jsonrpsee = { workspace = true, features = ["server", "ws-client"] }
-serde_json = { workspace = true, default-features = true }
-tokio = { features = ["macros"], workspace = true, default-features = true }
-substrate-test-runtime-client = { workspace = true }
-substrate-test-runtime = { workspace = true }
-substrate-test-runtime-transaction-pool = { workspace = true }
-sp-consensus = { workspace = true, default-features = true }
-sp-externalities = { workspace = true, default-features = true }
-sp-maybe-compressed-blob = { workspace = true, default-features = true }
+pretty_assertions = { workspace = true }
 sc-block-builder = { workspace = true, default-features = true }
-sc-service = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true, features = ["test-helpers"] }
-assert_matches = { workspace = true }
-pretty_assertions = { workspace = true }
+sc-service = { workspace = true, default-features = true }
 sc-transaction-pool = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-externalities = { workspace = true, default-features = true }
+sp-maybe-compressed-blob = { workspace = true, default-features = true }
+substrate-test-runtime = { workspace = true }
+substrate-test-runtime-client = { workspace = true }
+substrate-test-runtime-transaction-pool = { workspace = true }
+tokio = { features = ["macros"], workspace = true, default-features = true }
diff --git a/substrate/client/rpc/Cargo.toml b/substrate/client/rpc/Cargo.toml
index 6fe28a3873e9ac62c086858c4c71b0ccd8bf2589..8be932f02ed400b4079b22203a636f6188771dae 100644
--- a/substrate/client/rpc/Cargo.toml
+++ b/substrate/client/rpc/Cargo.toml
@@ -21,7 +21,6 @@ futures = { workspace = true }
 jsonrpsee = { features = ["server"], workspace = true }
 log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
@@ -30,6 +29,7 @@ sc-rpc-api = { workspace = true, default-features = true }
 sc-tracing = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
@@ -38,22 +38,22 @@ sp-offchain = { workspace = true, default-features = true }
 sp-rpc = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-session = { workspace = true, default-features = true }
-sp-version = { workspace = true, default-features = true }
 sp-statement-store = { workspace = true, default-features = true }
+sp-version = { workspace = true, default-features = true }
 tokio = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
+pretty_assertions = { workspace = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
 sc-transaction-pool = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
-tokio = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
-pretty_assertions = { workspace = true }
+tokio = { workspace = true, default-features = true }
 
 [features]
 test-helpers = []
diff --git a/substrate/client/runtime-utilities/Cargo.toml b/substrate/client/runtime-utilities/Cargo.toml
index 5e026a5eff1a20e4babe58b79387b413764196e2..716b577d384aa018771723c406d5b695b356019b 100644
--- a/substrate/client/runtime-utilities/Cargo.toml
+++ b/substrate/client/runtime-utilities/Cargo.toml
@@ -22,8 +22,8 @@ sc-executor = { workspace = true, default-features = true }
 sc-executor-common = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
-sp-wasm-interface = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
+sp-wasm-interface = { workspace = true, default-features = true }
 
 
 thiserror = { workspace = true }
@@ -31,6 +31,6 @@ thiserror = { workspace = true }
 [dev-dependencies]
 cumulus-primitives-proof-size-hostfunction = { workspace = true, default-features = true }
 cumulus-test-runtime = { workspace = true, default-features = true }
-sp-version = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
+sp-version = { workspace = true, default-features = true }
 subxt = { workspace = true, features = ["native"] }
diff --git a/substrate/client/service/Cargo.toml b/substrate/client/service/Cargo.toml
index 3981395d9768e7ad2fc7323a5bab8f7669a2ad8f..e46b252f30bf636d063baf4cae88d107497515f0 100644
--- a/substrate/client/service/Cargo.toml
+++ b/substrate/client/service/Cargo.toml
@@ -26,64 +26,64 @@ runtime-benchmarks = [
 ]
 
 [dependencies]
-jsonrpsee = { features = ["server"], workspace = true }
-thiserror = { workspace = true }
+async-trait = { workspace = true }
+codec = { workspace = true, default-features = true }
+directories = { workspace = true }
+exit-future = { workspace = true }
 futures = { workspace = true }
-rand = { workspace = true, default-features = true }
-parking_lot = { workspace = true, default-features = true }
-log = { workspace = true, default-features = true }
 futures-timer = { workspace = true }
-exit-future = { workspace = true }
+jsonrpsee = { features = ["server"], workspace = true }
+log = { workspace = true, default-features = true }
+parking_lot = { workspace = true, default-features = true }
 pin-project = { workspace = true }
-serde = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
-sp-trie = { workspace = true, default-features = true }
-sp-externalities = { workspace = true, default-features = true }
-sc-utils = { workspace = true, default-features = true }
-sp-version = { workspace = true, default-features = true }
-sp-blockchain = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-keystore = { workspace = true, default-features = true }
-sp-session = { workspace = true, default-features = true }
-sp-state-machine = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
+prometheus-endpoint = { workspace = true, default-features = true }
+rand = { workspace = true, default-features = true }
+sc-chain-spec = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
+sc-client-db = { workspace = true }
 sc-consensus = { workspace = true, default-features = true }
-sp-storage = { workspace = true, default-features = true }
+sc-executor = { workspace = true, default-features = true }
+sc-informant = { workspace = true, default-features = true }
+sc-keystore = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-common = { workspace = true, default-features = true }
 sc-network-light = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
-sc-network-types = { workspace = true, default-features = true }
 sc-network-transactions = { workspace = true, default-features = true }
-sc-chain-spec = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-sp-api = { workspace = true, default-features = true }
-sc-client-db = { workspace = true }
-codec = { workspace = true, default-features = true }
-sc-executor = { workspace = true, default-features = true }
-sc-transaction-pool = { workspace = true, default-features = true }
-sp-transaction-pool = { workspace = true, default-features = true }
-sc-transaction-pool-api = { workspace = true, default-features = true }
-sp-transaction-storage-proof = { workspace = true, default-features = true }
-sc-rpc-server = { workspace = true, default-features = true }
+sc-network-types = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true }
+sc-rpc-server = { workspace = true, default-features = true }
 sc-rpc-spec-v2 = { workspace = true, default-features = true }
-sc-informant = { workspace = true, default-features = true }
+sc-sysinfo = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
 sc-tracing = { workspace = true, default-features = true }
-sc-sysinfo = { workspace = true, default-features = true }
+sc-transaction-pool = { workspace = true, default-features = true }
+sc-transaction-pool-api = { workspace = true, default-features = true }
+sc-utils = { workspace = true, default-features = true }
+schnellru = { workspace = true }
+serde = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
+sp-api = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-externalities = { workspace = true, default-features = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-session = { workspace = true, default-features = true }
+sp-state-machine = { workspace = true, default-features = true }
+sp-storage = { workspace = true, default-features = true }
+sp-transaction-pool = { workspace = true, default-features = true }
+sp-transaction-storage-proof = { workspace = true, default-features = true }
+sp-trie = { workspace = true, default-features = true }
+sp-version = { workspace = true, default-features = true }
+static_init = { workspace = true }
+tempfile = { workspace = true }
+thiserror = { workspace = true }
+tokio = { features = ["parking_lot", "rt-multi-thread", "time"], workspace = true, default-features = true }
 tracing = { workspace = true, default-features = true }
 tracing-futures = { workspace = true }
-async-trait = { workspace = true }
-tokio = { features = ["parking_lot", "rt-multi-thread", "time"], workspace = true, default-features = true }
-tempfile = { workspace = true }
-directories = { workspace = true }
-static_init = { workspace = true }
-schnellru = { workspace = true }
 
 [dev-dependencies]
-substrate-test-runtime-client = { workspace = true }
 substrate-test-runtime = { workspace = true }
+substrate-test-runtime-client = { workspace = true }
diff --git a/substrate/client/service/test/Cargo.toml b/substrate/client/service/test/Cargo.toml
index 632b98104f6bfc9115bc145ee5c3410cbeb67835..45b2d8c5eea3a979b9bf0f4450c59beb9a6d2266 100644
--- a/substrate/client/service/test/Cargo.toml
+++ b/substrate/client/service/test/Cargo.toml
@@ -15,15 +15,13 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-async-channel = { workspace = true }
 array-bytes = { workspace = true, default-features = true }
+async-channel = { workspace = true }
+codec = { workspace = true, default-features = true }
 fdlimit = { workspace = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
-codec = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-tempfile = { workspace = true }
-tokio = { features = ["time"], workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-client-db = { workspace = true }
@@ -37,11 +35,13 @@ sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
 sp-storage = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 sp-trie = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
 substrate-test-runtime = { workspace = true }
 substrate-test-runtime-client = { workspace = true }
+tempfile = { workspace = true }
+tokio = { features = ["time"], workspace = true, default-features = true }
diff --git a/substrate/client/statement-store/Cargo.toml b/substrate/client/statement-store/Cargo.toml
index e5087eae6eca556e15033771f7ade7f0c3592465..c0219b294cede40480e4731c57bce19d98496a7e 100644
--- a/substrate/client/statement-store/Cargo.toml
+++ b/substrate/client/statement-store/Cargo.toml
@@ -17,18 +17,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 log = { workspace = true, default-features = true }
-parking_lot = { workspace = true, default-features = true }
 parity-db = { workspace = true }
-tokio = { features = ["time"], workspace = true, default-features = true }
-sp-statement-store = { workspace = true, default-features = true }
+parking_lot = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
+sc-keystore = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-sc-keystore = { workspace = true, default-features = true }
+sp-statement-store = { workspace = true, default-features = true }
+tokio = { features = ["time"], workspace = true, default-features = true }
 
 [dev-dependencies]
-tempfile = { workspace = true }
 sp-tracing = { workspace = true }
+tempfile = { workspace = true }
diff --git a/substrate/client/storage-monitor/Cargo.toml b/substrate/client/storage-monitor/Cargo.toml
index c017184ced66b41780d8dbfab6cbfab1cdde67e1..3d8cb72b1a92af234d3f9556fc02342aa0c39683 100644
--- a/substrate/client/storage-monitor/Cargo.toml
+++ b/substrate/client/storage-monitor/Cargo.toml
@@ -13,8 +13,8 @@ workspace = true
 
 [dependencies]
 clap = { features = ["derive", "string"], workspace = true }
-log = { workspace = true, default-features = true }
 fs4 = { workspace = true }
+log = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-tokio = { features = ["time"], workspace = true, default-features = true }
 thiserror = { workspace = true }
+tokio = { features = ["time"], workspace = true, default-features = true }
diff --git a/substrate/client/sync-state-rpc/Cargo.toml b/substrate/client/sync-state-rpc/Cargo.toml
index cbab8f4d7b0d87dcfb48bcfb9a021f300eee3217..91c30f5aa2cc213ac385178bc5a3756851a00e88 100644
--- a/substrate/client/sync-state-rpc/Cargo.toml
+++ b/substrate/client/sync-state-rpc/Cargo.toml
@@ -17,13 +17,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { workspace = true, default-features = true }
 jsonrpsee = { features = ["client-core", "macros", "server-core"], workspace = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 sc-chain-spec = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-consensus-babe = { workspace = true, default-features = true }
 sc-consensus-epochs = { workspace = true, default-features = true }
 sc-consensus-grandpa = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+thiserror = { workspace = true }
diff --git a/substrate/client/sysinfo/Cargo.toml b/substrate/client/sysinfo/Cargo.toml
index 190e6e279b90aa40b06ca031099e80136cd3e1f5..c7eed77eda7f0d23afeb4ebfe94597e5f61feeff 100644
--- a/substrate/client/sysinfo/Cargo.toml
+++ b/substrate/client/sysinfo/Cargo.toml
@@ -17,16 +17,16 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+derive_more = { workspace = true, default-features = true }
 futures = { workspace = true }
 libc = { workspace = true }
 log = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
 rand_pcg = { workspace = true }
-derive_more = { workspace = true, default-features = true }
 regex = { workspace = true }
+sc-telemetry = { workspace = true, default-features = true }
 serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
-sc-telemetry = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
diff --git a/substrate/client/telemetry/Cargo.toml b/substrate/client/telemetry/Cargo.toml
index db325a94ab21829eceab69392a60e9e83b973aa7..4a41a6b6deca9d0ebf1c46bfb25194ebe4359093 100644
--- a/substrate/client/telemetry/Cargo.toml
+++ b/substrate/client/telemetry/Cargo.toml
@@ -23,9 +23,9 @@ libp2p = { features = ["dns", "tcp", "tokio", "websocket"], workspace = true }
 log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
 pin-project = { workspace = true }
-sc-utils = { workspace = true, default-features = true }
-sc-network = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
+sc-network = { workspace = true, default-features = true }
+sc-utils = { workspace = true, default-features = true }
 serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
 thiserror = { workspace = true }
diff --git a/substrate/client/tracing/Cargo.toml b/substrate/client/tracing/Cargo.toml
index b8f5e40caf83b5c04d5823bb9ecefa0aa9b10bee..949f6f6018ad3fa3c7471a9fca39846482b8432c 100644
--- a/substrate/client/tracing/Cargo.toml
+++ b/substrate/client/tracing/Cargo.toml
@@ -16,30 +16,30 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-console = { workspace = true }
-is-terminal = { workspace = true }
 chrono = { workspace = true }
 codec = { workspace = true, default-features = true }
+console = { workspace = true }
+is-terminal = { workspace = true }
 libc = { workspace = true }
 log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
 rustc-hash = { workspace = true }
-serde = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-tracing = { workspace = true, default-features = true }
-tracing-log = { workspace = true }
-tracing-subscriber = { workspace = true, features = [
-	"env-filter",
-	"parking_lot",
-] }
 sc-client-api = { workspace = true, default-features = true }
 sc-tracing-proc-macro = { workspace = true, default-features = true }
+serde = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-rpc = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
+thiserror = { workspace = true }
+tracing = { workspace = true, default-features = true }
+tracing-log = { workspace = true }
+tracing-subscriber = { workspace = true, features = [
+	"env-filter",
+	"parking_lot",
+] }
 
 [dev-dependencies]
 criterion = { workspace = true, default-features = true }
diff --git a/substrate/client/transaction-pool/Cargo.toml b/substrate/client/transaction-pool/Cargo.toml
index d346add93a64df7809df8e6a3ae549da49788b0c..72586b984920b12c36561749cd75cfacd8280243 100644
--- a/substrate/client/transaction-pool/Cargo.toml
+++ b/substrate/client/transaction-pool/Cargo.toml
@@ -25,12 +25,11 @@ itertools = { workspace = true }
 linked-hash-map = { workspace = true }
 log = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-thiserror = { workspace = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
@@ -38,8 +37,9 @@ sp-crypto-hashing = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 sp-transaction-pool = { workspace = true, default-features = true }
-tokio-stream = { workspace = true }
+thiserror = { workspace = true }
 tokio = { workspace = true, default-features = true, features = ["macros", "time"] }
+tokio-stream = { workspace = true }
 
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
diff --git a/substrate/client/transaction-pool/api/Cargo.toml b/substrate/client/transaction-pool/api/Cargo.toml
index c55ee70b2cf59d213d83c1e20a959a6547ed9aff..6671492a4e926b8bed92384bc50cbadde3ed8573 100644
--- a/substrate/client/transaction-pool/api/Cargo.toml
+++ b/substrate/client/transaction-pool/api/Cargo.toml
@@ -17,10 +17,10 @@ codec = { workspace = true, default-features = true }
 futures = { workspace = true }
 log = { workspace = true, default-features = true }
 serde = { features = ["derive"], workspace = true, default-features = true }
-thiserror = { workspace = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 serde_json = { workspace = true, default-features = true }
diff --git a/substrate/frame/Cargo.toml b/substrate/frame/Cargo.toml
index 2d0daf82997d90e7d21ff7f603cce328800f393a..8fc0d84684305bf062dcf2566eff7b934bb8407d 100644
--- a/substrate/frame/Cargo.toml
+++ b/substrate/frame/Cargo.toml
@@ -26,28 +26,28 @@ scale-info = { features = [
 ], workspace = true }
 
 # primitive deps, used for developing FRAME pallets.
-sp-runtime = { workspace = true }
-sp-io = { workspace = true }
-sp-core = { workspace = true }
 sp-arithmetic = { workspace = true }
+sp-core = { workspace = true }
+sp-io = { workspace = true }
+sp-runtime = { workspace = true }
 
 # frame deps, for developing FRAME pallets.
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 
 # primitive types used for developing FRAME runtimes.
-sp-version = { optional = true, workspace = true }
 sp-api = { optional = true, workspace = true }
 sp-block-builder = { optional = true, workspace = true }
-sp-transaction-pool = { optional = true, workspace = true }
-sp-offchain = { optional = true, workspace = true }
-sp-session = { optional = true, workspace = true }
 sp-consensus-aura = { optional = true, workspace = true }
 sp-consensus-grandpa = { optional = true, workspace = true }
 sp-genesis-builder = { optional = true, workspace = true }
 sp-inherents = { optional = true, workspace = true }
-sp-storage = { optional = true, workspace = true }
 sp-keyring = { optional = true, workspace = true }
+sp-offchain = { optional = true, workspace = true }
+sp-session = { optional = true, workspace = true }
+sp-storage = { optional = true, workspace = true }
+sp-transaction-pool = { optional = true, workspace = true }
+sp-version = { optional = true, workspace = true }
 
 frame-executive = { optional = true, workspace = true }
 frame-system-rpc-runtime-api = { optional = true, workspace = true }
diff --git a/substrate/frame/alliance/Cargo.toml b/substrate/frame/alliance/Cargo.toml
index 451b86b35ddef7fa96945888e9b885444171dc9d..9d21b9e964c9a0346e98933b94391cd3546c7b1e 100644
--- a/substrate/frame/alliance/Cargo.toml
+++ b/substrate/frame/alliance/Cargo.toml
@@ -31,14 +31,14 @@ frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 
-pallet-identity = { workspace = true }
 pallet-collective = { optional = true, workspace = true }
+pallet-identity = { workspace = true }
 
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
-sp-crypto-hashing = { workspace = true }
 pallet-balances = { workspace = true, default-features = true }
 pallet-collective = { workspace = true, default-features = true }
+sp-crypto-hashing = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/asset-conversion/Cargo.toml b/substrate/frame/asset-conversion/Cargo.toml
index 10a118e95639a102ad6be155a2453a9f9449f846..8987e44ee000a3a549fffdd09bc4e9942662e9c5 100644
--- a/substrate/frame/asset-conversion/Cargo.toml
+++ b/substrate/frame/asset-conversion/Cargo.toml
@@ -17,20 +17,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
+frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
+log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 sp-api = { workspace = true }
+sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-arithmetic = { workspace = true }
 
 [dev-dependencies]
-pallet-balances = { workspace = true, default-features = true }
 pallet-assets = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
 primitive-types = { features = ["codec", "num-traits", "scale-info"], workspace = true }
 
 [features]
diff --git a/substrate/frame/asset-conversion/ops/Cargo.toml b/substrate/frame/asset-conversion/ops/Cargo.toml
index 66333f973d7f277145e07df53770ad3d714f760c..ebd31bd296de1262af83e20154f23ddb7148bda4 100644
--- a/substrate/frame/asset-conversion/ops/Cargo.toml
+++ b/substrate/frame/asset-conversion/ops/Cargo.toml
@@ -16,20 +16,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
+frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
+log = { workspace = true }
 pallet-asset-conversion = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
+sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-arithmetic = { workspace = true }
 
 [dev-dependencies]
-pallet-balances = { workspace = true, default-features = true }
 pallet-assets = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
 primitive-types = { features = ["codec", "num-traits", "scale-info"], workspace = true }
 
 [features]
diff --git a/substrate/frame/asset-rate/Cargo.toml b/substrate/frame/asset-rate/Cargo.toml
index 514b6fa40c2b40b315b3964a71f932143bf62482..01a5ca21b199b40f8310336947d63e9d13550362 100644
--- a/substrate/frame/asset-rate/Cargo.toml
+++ b/substrate/frame/asset-rate/Cargo.toml
@@ -18,17 +18,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-sp-runtime = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { optional = true, workspace = true }
+sp-runtime = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
 sp-core = { workspace = true }
+sp-io = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/assets-freezer/Cargo.toml b/substrate/frame/assets-freezer/Cargo.toml
index 68bfdd7cfb627c67c8097266dd05df6a8ab38914..3fffa4d0627fa22624204ac11af3c2372a1e9e02 100644
--- a/substrate/frame/assets-freezer/Cargo.toml
+++ b/substrate/frame/assets-freezer/Cargo.toml
@@ -16,18 +16,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-assets = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
-sp-io = { workspace = true }
-sp-core = { workspace = true }
 pallet-balances = { workspace = true }
+sp-core = { workspace = true }
+sp-io = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/assets/Cargo.toml b/substrate/frame/assets/Cargo.toml
index e20b576d0836ec959ea3a050c4b269659b724214..a062a68d422065e779b91c0775e95628d4d96519 100644
--- a/substrate/frame/assets/Cargo.toml
+++ b/substrate/frame/assets/Cargo.toml
@@ -25,13 +25,13 @@ sp-runtime = { workspace = true }
 # Needed for type-safe access to storage DB.
 frame-support = { workspace = true }
 # `system` module provides us with all sorts of useful stuff and macros depend on it being around.
-frame-system = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
+frame-system = { workspace = true }
 sp-core = { workspace = true }
 
 [dev-dependencies]
-sp-io = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/atomic-swap/Cargo.toml b/substrate/frame/atomic-swap/Cargo.toml
index 1f97f60149ba8a4eca67efdda0908d8aaf89785d..785bfee71b683653fba9f3f9c8be1e531927e01f 100644
--- a/substrate/frame/atomic-swap/Cargo.toml
+++ b/substrate/frame/atomic-swap/Cargo.toml
@@ -17,8 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame = { workspace = true, features = ["experimental", "runtime"] }
+scale-info = { features = ["derive"], workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
diff --git a/substrate/frame/aura/Cargo.toml b/substrate/frame/aura/Cargo.toml
index 94b057d665d412df64c4df7e8e8d06f25f3180d0..94a47e4d96cd6fb6241085d1c3f4e0c6881eb2be 100644
--- a/substrate/frame/aura/Cargo.toml
+++ b/substrate/frame/aura/Cargo.toml
@@ -17,11 +17,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-timestamp = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-application-crypto = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/authority-discovery/Cargo.toml b/substrate/frame/authority-discovery/Cargo.toml
index 01f574a262ad3955dbcc7a9ff539a6ffab453b55..506c292c837b1d13edf37b759a706a1b12d3193d 100644
--- a/substrate/frame/authority-discovery/Cargo.toml
+++ b/substrate/frame/authority-discovery/Cargo.toml
@@ -19,12 +19,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-session = { features = [
 	"historical",
 ], workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-application-crypto = { workspace = true }
 sp-authority-discovery = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/authorship/Cargo.toml b/substrate/frame/authorship/Cargo.toml
index 74a4a93147a8b606510f242b3b8ad6755dcf9952..f8b587d449090908a54a89c211ed7abeb6f5ae3a 100644
--- a/substrate/frame/authorship/Cargo.toml
+++ b/substrate/frame/authorship/Cargo.toml
@@ -19,10 +19,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-impl-trait-for-tuples = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
diff --git a/substrate/frame/babe/Cargo.toml b/substrate/frame/babe/Cargo.toml
index f0a7f4648c0a56821c31fe4602b3d952510bbfbf..8673e08472eb0400e291fa9eddc9137c9282942e 100644
--- a/substrate/frame/babe/Cargo.toml
+++ b/substrate/frame/babe/Cargo.toml
@@ -17,14 +17,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-session = { workspace = true }
 pallet-timestamp = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
 sp-application-crypto = { features = ["serde"], workspace = true }
 sp-consensus-babe = { features = ["serde"], workspace = true }
 sp-core = { features = ["serde"], workspace = true }
diff --git a/substrate/frame/bags-list/Cargo.toml b/substrate/frame/bags-list/Cargo.toml
index 647f5d26686aa805a3a2632c23c9f63112598bf8..6b1c4809f77351837e8900e743dde195125d65c8 100644
--- a/substrate/frame/bags-list/Cargo.toml
+++ b/substrate/frame/bags-list/Cargo.toml
@@ -27,14 +27,14 @@ scale-info = { features = [
 sp-runtime = { workspace = true }
 
 # FRAME
+frame-election-provider-support = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-frame-election-provider-support = { workspace = true }
 
 # third party
-log = { workspace = true }
-docify = { workspace = true }
 aquamarine = { workspace = true }
+docify = { workspace = true }
+log = { workspace = true }
 
 # Optional imports for benchmarking
 frame-benchmarking = { optional = true, workspace = true }
@@ -44,12 +44,12 @@ sp-io = { optional = true, workspace = true }
 sp-tracing = { optional = true, workspace = true }
 
 [dev-dependencies]
+frame-benchmarking = { workspace = true, default-features = true }
+frame-election-provider-support = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
-frame-election-provider-support = { workspace = true, default-features = true }
-frame-benchmarking = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/bags-list/fuzzer/Cargo.toml b/substrate/frame/bags-list/fuzzer/Cargo.toml
index b52fc88482376a590ac7fcf805aa705c8f3fdaba..db46bc6fe4465670b05076fb83d4cb056fb64e53 100644
--- a/substrate/frame/bags-list/fuzzer/Cargo.toml
+++ b/substrate/frame/bags-list/fuzzer/Cargo.toml
@@ -13,10 +13,10 @@ publish = false
 workspace = true
 
 [dependencies]
-honggfuzz = { workspace = true }
-rand = { features = ["small_rng", "std"], workspace = true, default-features = true }
 frame-election-provider-support = { features = ["fuzz"], workspace = true, default-features = true }
+honggfuzz = { workspace = true }
 pallet-bags-list = { features = ["fuzz"], workspace = true, default-features = true }
+rand = { features = ["small_rng", "std"], workspace = true, default-features = true }
 
 [[bin]]
 name = "bags-list"
diff --git a/substrate/frame/bags-list/remote-tests/Cargo.toml b/substrate/frame/bags-list/remote-tests/Cargo.toml
index 12d61b61c06d9802f2859a9f2efd95a2ae1f6f96..99b203e73fb0475569ab35823cff685454b65d68 100644
--- a/substrate/frame/bags-list/remote-tests/Cargo.toml
+++ b/substrate/frame/bags-list/remote-tests/Cargo.toml
@@ -17,18 +17,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 # frame
-pallet-staking = { workspace = true, default-features = true }
-pallet-bags-list = { features = ["fuzz"], workspace = true, default-features = true }
 frame-election-provider-support = { workspace = true, default-features = true }
-frame-system = { workspace = true, default-features = true }
 frame-support = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
+pallet-bags-list = { features = ["fuzz"], workspace = true, default-features = true }
+pallet-staking = { workspace = true, default-features = true }
 
 # core
-sp-storage = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-std = { workspace = true, default-features = true }
+sp-storage = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 
 # utils
 remote-externalities = { workspace = true, default-features = true }
diff --git a/substrate/frame/balances/Cargo.toml b/substrate/frame/balances/Cargo.toml
index f0117555c37ea5c4ec3d3fee6741be421e58914a..03bc7fcb3fcc046db46712dd5f2deaaeacbe4617 100644
--- a/substrate/frame/balances/Cargo.toml
+++ b/substrate/frame/balances/Cargo.toml
@@ -17,20 +17,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
+docify = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
-docify = { workspace = true }
 
 [dev-dependencies]
-pallet-transaction-payment = { workspace = true, default-features = true }
 frame-support = { features = ["experimental"], workspace = true, default-features = true }
+pallet-transaction-payment = { workspace = true, default-features = true }
+paste = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-paste = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/beefy-mmr/Cargo.toml b/substrate/frame/beefy-mmr/Cargo.toml
index d67ac20ee922bc299956d8201a1552b2651c9527..54343bb9ce51a9695f4dd489d8eaf596fd6c8d8e 100644
--- a/substrate/frame/beefy-mmr/Cargo.toml
+++ b/substrate/frame/beefy-mmr/Cargo.toml
@@ -13,22 +13,22 @@ workspace = true
 
 [dependencies]
 array-bytes = { optional = true, workspace = true, default-features = true }
-codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { optional = true, workspace = true, default-features = true }
 binary-merkle-tree = { workspace = true }
+codec = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-beefy = { workspace = true }
 pallet-mmr = { workspace = true }
 pallet-session = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
+sp-api = { workspace = true }
 sp-consensus-beefy = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-api = { workspace = true }
 sp-state-machine = { workspace = true }
 
 [dev-dependencies]
diff --git a/substrate/frame/beefy/Cargo.toml b/substrate/frame/beefy/Cargo.toml
index 05af974e89a703408fead24adb16a00da272fec9..b8e952dfbd66db87bb49579ba6dcebc0d779ee72 100644
--- a/substrate/frame/beefy/Cargo.toml
+++ b/substrate/frame/beefy/Cargo.toml
@@ -13,13 +13,13 @@ workspace = true
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
-serde = { optional = true, workspace = true, default-features = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-session = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
 sp-consensus-beefy = { features = ["serde"], workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
 sp-session = { workspace = true }
diff --git a/substrate/frame/benchmarking/Cargo.toml b/substrate/frame/benchmarking/Cargo.toml
index 0c74d94b33b8938e0594c21d52631a75f99e895f..fabeb9a03195a36f7912850bce08022755b7ed98 100644
--- a/substrate/frame/benchmarking/Cargo.toml
+++ b/substrate/frame/benchmarking/Cargo.toml
@@ -17,14 +17,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
+frame-support = { workspace = true }
+frame-support-procedural = { workspace = true }
+frame-system = { workspace = true }
 linregress = { optional = true, workspace = true }
 log = { workspace = true }
 paste = { workspace = true, default-features = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { optional = true, workspace = true, default-features = true }
-frame-support = { workspace = true }
-frame-support-procedural = { workspace = true }
-frame-system = { workspace = true }
 sp-api = { workspace = true }
 sp-application-crypto = { workspace = true }
 sp-core = { workspace = true }
@@ -37,10 +37,10 @@ static_assertions = { workspace = true, default-features = true }
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
 rusty-fork = { workspace = true }
-sp-keystore = { workspace = true, default-features = true }
 sc-client-db = { workspace = true }
-sp-state-machine = { workspace = true }
 sp-externalities = { workspace = true }
+sp-keystore = { workspace = true, default-features = true }
+sp-state-machine = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/benchmarking/pov/Cargo.toml b/substrate/frame/benchmarking/pov/Cargo.toml
index ce89dceed3c3f2d6ee89e2c4e9ab5389b5c6f19b..47c6d6e5e4bc8109d6088eb80c44377bb4cc772d 100644
--- a/substrate/frame/benchmarking/pov/Cargo.toml
+++ b/substrate/frame/benchmarking/pov/Cargo.toml
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/frame/bounties/Cargo.toml b/substrate/frame/bounties/Cargo.toml
index a272153fed07d46c5209eeac8def20333aa46a42..926af60d1acb3283317f429b3cd55d5346bd226c 100644
--- a/substrate/frame/bounties/Cargo.toml
+++ b/substrate/frame/bounties/Cargo.toml
@@ -19,12 +19,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-treasury = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/broker/Cargo.toml b/substrate/frame/broker/Cargo.toml
index aead49013ef068a3ec1b31404bab06ca07ede63a..a4cfe49d3b354a6300b5ec9a1a78b6f958757e24 100644
--- a/substrate/frame/broker/Cargo.toml
+++ b/substrate/frame/broker/Cargo.toml
@@ -15,22 +15,22 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-log = { workspace = true }
+bitvec = { workspace = true }
 codec = { features = ["derive"], workspace = true }
+frame-benchmarking = { optional = true, workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-bitvec = { workspace = true }
 sp-api = { workspace = true }
 sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
 
 [dev-dependencies]
+pretty_assertions = { workspace = true }
 sp-io = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
-pretty_assertions = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/child-bounties/Cargo.toml b/substrate/frame/child-bounties/Cargo.toml
index a250886b5e3d45e679dd9cab41f94f92739d8b90..b7d9d245892ac51bdf7945080a7d8025588d3897 100644
--- a/substrate/frame/child-bounties/Cargo.toml
+++ b/substrate/frame/child-bounties/Cargo.toml
@@ -19,13 +19,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-bounties = { workspace = true }
 pallet-treasury = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/collective/Cargo.toml b/substrate/frame/collective/Cargo.toml
index 59a9d23f7b1958b4137ea6b8412a0d3bfe44e163..8e53000352aea22ecfd2a5d232ec590ff3198289 100644
--- a/substrate/frame/collective/Cargo.toml
+++ b/substrate/frame/collective/Cargo.toml
@@ -18,11 +18,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { features = ["derive"], workspace = true }
 docify = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { features = ["experimental"], workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/contracts/Cargo.toml b/substrate/frame/contracts/Cargo.toml
index 96351752918a062e05e6b6bab13111bc18dd8258..e39128639e3e06e289684ee90c7a14448ac50ce1 100644
--- a/substrate/frame/contracts/Cargo.toml
+++ b/substrate/frame/contracts/Cargo.toml
@@ -18,25 +18,25 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-paste = { workspace = true }
 bitflags = { workspace = true }
 codec = { features = [
 	"derive",
 	"max-encoded-len",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
+impl-trait-for-tuples = { workspace = true }
 log = { workspace = true }
+paste = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
 smallvec = { features = [
 	"const_generics",
 ], workspace = true }
 wasmi = { workspace = true }
-impl-trait-for-tuples = { workspace = true }
 
 # Only used in benchmarking to generate contract code
-wasm-instrument = { optional = true, workspace = true }
 rand = { optional = true, workspace = true }
 rand_pcg = { optional = true, workspace = true }
+wasm-instrument = { optional = true, workspace = true }
 
 # Substrate Dependencies
 environmental = { workspace = true }
@@ -44,8 +44,8 @@ frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-balances = { optional = true, workspace = true }
-pallet-contracts-uapi = { workspace = true, default-features = true }
 pallet-contracts-proc-macro = { workspace = true, default-features = true }
+pallet-contracts-uapi = { workspace = true, default-features = true }
 sp-api = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
@@ -58,21 +58,21 @@ xcm-builder = { workspace = true }
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
+pallet-contracts-fixtures = { workspace = true }
 pretty_assertions = { workspace = true }
 wat = { workspace = true }
-pallet-contracts-fixtures = { workspace = true }
 
 # Polkadot Dependencies
 xcm-builder = { workspace = true, default-features = true }
 
 # Substrate Dependencies
+pallet-assets = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
-pallet-message-queue = { workspace = true, default-features = true }
 pallet-insecure-randomness-collective-flip = { workspace = true, default-features = true }
-pallet-utility = { workspace = true, default-features = true }
-pallet-assets = { workspace = true, default-features = true }
+pallet-message-queue = { workspace = true, default-features = true }
 pallet-proxy = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
+pallet-utility = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 
diff --git a/substrate/frame/contracts/fixtures/Cargo.toml b/substrate/frame/contracts/fixtures/Cargo.toml
index 4c01c1f061b7a8e70251a22e46add05b86971d60..cf31f9eccc9c6a6a404ba66316525f55b960aade 100644
--- a/substrate/frame/contracts/fixtures/Cargo.toml
+++ b/substrate/frame/contracts/fixtures/Cargo.toml
@@ -11,13 +11,13 @@ description = "Fixtures for testing contracts pallet."
 workspace = true
 
 [dependencies]
+anyhow = { workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-anyhow = { workspace = true, default-features = true }
 
 [build-dependencies]
+anyhow = { workspace = true, default-features = true }
 parity-wasm = { workspace = true }
 tempfile = { workspace = true }
 toml = { workspace = true }
 twox-hash = { workspace = true, default-features = true }
-anyhow = { workspace = true, default-features = true }
diff --git a/substrate/frame/contracts/fixtures/build/Cargo.toml b/substrate/frame/contracts/fixtures/build/Cargo.toml
index ba487a2bb5ca68f8533dec7ae32541dd0f429756..18e8c2767d5f6f4e68c1dc4fb77cfab05eebd601 100644
--- a/substrate/frame/contracts/fixtures/build/Cargo.toml
+++ b/substrate/frame/contracts/fixtures/build/Cargo.toml
@@ -8,9 +8,9 @@ edition = "2021"
 
 # All paths or versions are injected dynamically by the build script.
 [dependencies]
-uapi = { package = 'pallet-contracts-uapi', path = "", default-features = false }
 common = { package = 'pallet-contracts-fixtures-common', path = "" }
 polkavm-derive = { version = "" }
+uapi = { package = 'pallet-contracts-uapi', path = "", default-features = false }
 
 [profile.release]
 opt-level = 3
diff --git a/substrate/frame/contracts/mock-network/Cargo.toml b/substrate/frame/contracts/mock-network/Cargo.toml
index 66137bc8a0c63f9bebc453ee7273a44e4eb8133e..a7423b33abc17f02491fcbd41da04a698f9f378d 100644
--- a/substrate/frame/contracts/mock-network/Cargo.toml
+++ b/substrate/frame/contracts/mock-network/Cargo.toml
@@ -19,8 +19,8 @@ frame-system = { workspace = true }
 pallet-assets = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
 pallet-contracts = { workspace = true, default-features = true }
-pallet-contracts-uapi = { workspace = true }
 pallet-contracts-proc-macro = { workspace = true, default-features = true }
+pallet-contracts-uapi = { workspace = true }
 pallet-insecure-randomness-collective-flip = { workspace = true, default-features = true }
 pallet-message-queue = { workspace = true, default-features = true }
 pallet-proxy = { workspace = true, default-features = true }
@@ -44,8 +44,8 @@ xcm-simulator = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
-pretty_assertions = { workspace = true }
 pallet-contracts-fixtures = { workspace = true }
+pretty_assertions = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/contracts/uapi/Cargo.toml b/substrate/frame/contracts/uapi/Cargo.toml
index 45f8c2cb84afd8b20669c345f96fe9a72b66a58b..8297c35b31db55e8bd72cfc5aa78322ae8ebbede 100644
--- a/substrate/frame/contracts/uapi/Cargo.toml
+++ b/substrate/frame/contracts/uapi/Cargo.toml
@@ -12,13 +12,13 @@ description = "Exposes all the host functions that a contract can import."
 workspace = true
 
 [dependencies]
-paste = { workspace = true }
 bitflags = { workspace = true }
-scale-info = { features = ["derive"], optional = true, workspace = true }
 codec = { features = [
 	"derive",
 	"max-encoded-len",
 ], optional = true, workspace = true }
+paste = { workspace = true }
+scale-info = { features = ["derive"], optional = true, workspace = true }
 
 [package.metadata.docs.rs]
 targets = ["wasm32-unknown-unknown"]
diff --git a/substrate/frame/conviction-voting/Cargo.toml b/substrate/frame/conviction-voting/Cargo.toml
index fdb4310610d935dd4ec4b210676638ab9e0a3850..2d23f493ea0132a742691fe9f3179177d310c951 100644
--- a/substrate/frame/conviction-voting/Cargo.toml
+++ b/substrate/frame/conviction-voting/Cargo.toml
@@ -21,11 +21,11 @@ codec = { features = [
 	"derive",
 	"max-encoded-len",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/frame/core-fellowship/Cargo.toml b/substrate/frame/core-fellowship/Cargo.toml
index 3d73ec58d6139610382320e62c526afc3ffc6bd6..c0017f477251445d4186fb53a0ad616632506251 100644
--- a/substrate/frame/core-fellowship/Cargo.toml
+++ b/substrate/frame/core-fellowship/Cargo.toml
@@ -17,16 +17,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+pallet-ranked-collective = { optional = true, workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-pallet-ranked-collective = { optional = true, workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/delegated-staking/Cargo.toml b/substrate/frame/delegated-staking/Cargo.toml
index 8d5ccd342b6b639ae0644a5e1a14f0c0ed14be3e..576276dced5212c47d85777a6a9606a3822a0dbb 100644
--- a/substrate/frame/delegated-staking/Cargo.toml
+++ b/substrate/frame/delegated-staking/Cargo.toml
@@ -15,23 +15,23 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
+sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-staking = { workspace = true }
-sp-io = { workspace = true }
-log = { workspace = true }
 
 [dev-dependencies]
+frame-election-provider-support = { workspace = true }
+pallet-balances = { workspace = true, default-features = true }
+pallet-nomination-pools = { workspace = true, default-features = true }
+pallet-staking = { workspace = true, default-features = true }
+pallet-staking-reward-curve = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-substrate-test-utils = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
-pallet-staking = { workspace = true, default-features = true }
-pallet-nomination-pools = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
-pallet-staking-reward-curve = { workspace = true, default-features = true }
-frame-election-provider-support = { workspace = true }
+substrate-test-utils = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/democracy/Cargo.toml b/substrate/frame/democracy/Cargo.toml
index 3cfea8bb312921b606a1df79222f5e29772cc109..189d64ccaa74120063764c17f8a78d6df1a299a8 100644
--- a/substrate/frame/democracy/Cargo.toml
+++ b/substrate/frame/democracy/Cargo.toml
@@ -19,20 +19,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
+sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-core = { workspace = true }
-log = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
-pallet-scheduler = { workspace = true, default-features = true }
 pallet-preimage = { workspace = true, default-features = true }
+pallet-scheduler = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/election-provider-multi-phase/Cargo.toml b/substrate/frame/election-provider-multi-phase/Cargo.toml
index ff2a997fafe03ea883e9ae3b2124f8e4d80a6c13..9a4a2a839346449e3016dd70dc2fa78988adfa5d 100644
--- a/substrate/frame/election-provider-multi-phase/Cargo.toml
+++ b/substrate/frame/election-provider-multi-phase/Cargo.toml
@@ -18,20 +18,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
+log = { workspace = true }
 scale-info = { features = [
 	"derive",
 ], workspace = true }
-log = { workspace = true }
 
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 
-sp-io = { workspace = true }
+frame-election-provider-support = { workspace = true }
+sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
-sp-runtime = { workspace = true }
+sp-io = { workspace = true }
 sp-npos-elections = { workspace = true }
-sp-arithmetic = { workspace = true }
-frame-election-provider-support = { workspace = true }
+sp-runtime = { workspace = true }
 
 # Optional imports for benchmarking
 frame-benchmarking = { optional = true, workspace = true }
@@ -40,14 +40,14 @@ rand = { features = ["alloc", "small_rng"], optional = true, workspace = true }
 strum = { features = ["derive"], optional = true, workspace = true }
 
 [dev-dependencies]
+frame-benchmarking = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true, default-features = true }
 sp-npos-elections = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
-frame-benchmarking = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml b/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml
index 771376e06656a03c9fca0715b77a466cd6165593..5009d3d54d56dc9009a5b8ae52bb00c614372208 100644
--- a/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml
+++ b/substrate/frame/election-provider-multi-phase/test-staking-e2e/Cargo.toml
@@ -16,30 +16,30 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dev-dependencies]
-parking_lot = { workspace = true, default-features = true }
 codec = { features = ["derive"], workspace = true, default-features = true }
-scale-info = { features = ["derive"], workspace = true, default-features = true }
 log = { workspace = true }
+parking_lot = { workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true, default-features = true }
 
-sp-runtime = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
-sp-staking = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 sp-npos-elections = { workspace = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-staking = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 
-frame-system = { workspace = true, default-features = true }
-frame-support = { workspace = true, default-features = true }
 frame-election-provider-support = { workspace = true, default-features = true }
+frame-support = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 
-pallet-election-provider-multi-phase = { workspace = true, default-features = true }
-pallet-staking = { workspace = true, default-features = true }
-pallet-nomination-pools = { workspace = true, default-features = true }
 pallet-bags-list = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
+pallet-election-provider-multi-phase = { workspace = true, default-features = true }
+pallet-nomination-pools = { workspace = true, default-features = true }
 pallet-session = { workspace = true, default-features = true }
+pallet-staking = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
 
 [features]
 try-runtime = [
diff --git a/substrate/frame/election-provider-support/Cargo.toml b/substrate/frame/election-provider-support/Cargo.toml
index cae20d1b46a480a7cf0c3b542870425d67283363..32fa381e1d2745851dcea7a7b10ddac1dc8b1998 100644
--- a/substrate/frame/election-provider-support/Cargo.toml
+++ b/substrate/frame/election-provider-support/Cargo.toml
@@ -16,14 +16,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-election-provider-solution-type = { workspace = true, default-features = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-arithmetic = { workspace = true }
+sp-core = { workspace = true }
 sp-npos-elections = { workspace = true }
 sp-runtime = { workspace = true }
-sp-core = { workspace = true }
 
 [dev-dependencies]
 rand = { features = ["small_rng"], workspace = true, default-features = true }
diff --git a/substrate/frame/election-provider-support/solution-type/Cargo.toml b/substrate/frame/election-provider-support/solution-type/Cargo.toml
index e24ed7f079fe8f5ae44f1178df7d895cfd97ad75..c2f307016f6b9c1641aacb65dcd0cb093f826fd5 100644
--- a/substrate/frame/election-provider-support/solution-type/Cargo.toml
+++ b/substrate/frame/election-provider-support/solution-type/Cargo.toml
@@ -18,10 +18,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-syn = { features = ["full", "visit"], workspace = true }
-quote = { workspace = true }
-proc-macro2 = { workspace = true }
 proc-macro-crate = { workspace = true }
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
+syn = { features = ["full", "visit"], workspace = true }
 
 [dev-dependencies]
 codec = { workspace = true, default-features = true }
diff --git a/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml b/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml
index 86abbf9677e020669b362dd51b9972bc34beaab2..d82a8acb2f84af7b280b2ce8a348a4ac34a6db8c 100644
--- a/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml
+++ b/substrate/frame/election-provider-support/solution-type/fuzzer/Cargo.toml
@@ -21,14 +21,14 @@ honggfuzz = { workspace = true }
 rand = { features = ["small_rng", "std"], workspace = true, default-features = true }
 
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-election-provider-solution-type = { workspace = true, default-features = true }
 frame-election-provider-support = { workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-arithmetic = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 # used by generate_solution_type:
-sp-npos-elections = { workspace = true }
 frame-support = { workspace = true, default-features = true }
+sp-npos-elections = { workspace = true }
 
 [[bin]]
 name = "compact"
diff --git a/substrate/frame/elections-phragmen/Cargo.toml b/substrate/frame/elections-phragmen/Cargo.toml
index c1b12b3da4d80c08e588d35f7fabb6a1085ff957..b24ec7bd637e21083de8e4f16109907f86347ca6 100644
--- a/substrate/frame/elections-phragmen/Cargo.toml
+++ b/substrate/frame/elections-phragmen/Cargo.toml
@@ -19,11 +19,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-npos-elections = { workspace = true }
diff --git a/substrate/frame/examples/Cargo.toml b/substrate/frame/examples/Cargo.toml
index 0c6ad5ef0978eb05b2466bf063a219db274dc4c9..9eac53f0d98b064c3b271357db6c0bf6b4f3a005 100644
--- a/substrate/frame/examples/Cargo.toml
+++ b/substrate/frame/examples/Cargo.toml
@@ -18,14 +18,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 pallet-default-config-example = { workspace = true }
 pallet-dev-mode = { workspace = true }
+pallet-example-authorization-tx-extension = { workspace = true }
 pallet-example-basic = { workspace = true }
 pallet-example-frame-crate = { workspace = true }
 pallet-example-kitchensink = { workspace = true }
 pallet-example-offchain-worker = { workspace = true }
-pallet-example-split = { workspace = true }
 pallet-example-single-block-migrations = { workspace = true }
+pallet-example-split = { workspace = true }
 pallet-example-tasks = { workspace = true }
-pallet-example-authorization-tx-extension = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/examples/basic/Cargo.toml b/substrate/frame/examples/basic/Cargo.toml
index f7e2b653c2d15f4688df88bea4c4b5a45c011a2e..1deb82cc6ea5cc2ed8539bb02ed1bb2b37717ae7 100644
--- a/substrate/frame/examples/basic/Cargo.toml
+++ b/substrate/frame/examples/basic/Cargo.toml
@@ -18,12 +18,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-balances = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/frame/examples/default-config/Cargo.toml b/substrate/frame/examples/default-config/Cargo.toml
index fa376b4f9136aae67cc23548db9ecf7d770994a3..87485aa08ef0e3bfe63376ee05922b3769d0efa4 100644
--- a/substrate/frame/examples/default-config/Cargo.toml
+++ b/substrate/frame/examples/default-config/Cargo.toml
@@ -18,10 +18,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/examples/dev-mode/Cargo.toml b/substrate/frame/examples/dev-mode/Cargo.toml
index 6625fb3a5851102d73286dfcdd5d5b5529e1d873..7589abb929d50344091ee9860e6d14e3426dfc24 100644
--- a/substrate/frame/examples/dev-mode/Cargo.toml
+++ b/substrate/frame/examples/dev-mode/Cargo.toml
@@ -17,11 +17,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-balances = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/frame/examples/multi-block-migrations/Cargo.toml b/substrate/frame/examples/multi-block-migrations/Cargo.toml
index 98569964a9c9e5a2c68884e52b53dbceed90696c..6e8e8978426653fe5e270032d995fcf70ec65f3b 100644
--- a/substrate/frame/examples/multi-block-migrations/Cargo.toml
+++ b/substrate/frame/examples/multi-block-migrations/Cargo.toml
@@ -14,11 +14,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-pallet-migrations = { workspace = true }
+frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
 log = { workspace = true }
+pallet-migrations = { workspace = true }
 scale-info = { workspace = true }
 sp-io = { workspace = true }
 
diff --git a/substrate/frame/examples/offchain-worker/Cargo.toml b/substrate/frame/examples/offchain-worker/Cargo.toml
index a5664dd912d4b348c79f6123b265798b90856660..fabdfb0f9e0c36a9b50b3143be21383b835182a3 100644
--- a/substrate/frame/examples/offchain-worker/Cargo.toml
+++ b/substrate/frame/examples/offchain-worker/Cargo.toml
@@ -18,11 +18,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
 lite-json = { workspace = true }
 log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-frame-support = { workspace = true }
-frame-system = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-keystore = { optional = true, workspace = true }
diff --git a/substrate/frame/examples/single-block-migrations/Cargo.toml b/substrate/frame/examples/single-block-migrations/Cargo.toml
index 26a3a9fff75317ed7af879ffebb1a849f3a26182..4df8693e0f37d71d72c27b5309a1a3507963c90c 100644
--- a/substrate/frame/examples/single-block-migrations/Cargo.toml
+++ b/substrate/frame/examples/single-block-migrations/Cargo.toml
@@ -13,18 +13,18 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-docify = { workspace = true }
-log = { workspace = true }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-frame-support = { workspace = true }
+docify = { workspace = true }
 frame-executive = { workspace = true }
+frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
+log = { workspace = true }
 pallet-balances = { workspace = true }
-sp-runtime = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
+sp-runtime = { workspace = true }
 sp-version = { workspace = true }
 
 [features]
diff --git a/substrate/frame/examples/tasks/Cargo.toml b/substrate/frame/examples/tasks/Cargo.toml
index 00695ceddf1977aaccfeec31db93c248c8391677..48f4d9e66e9c2c4e6c1ef92b5cddfd9cb9d08923 100644
--- a/substrate/frame/examples/tasks/Cargo.toml
+++ b/substrate/frame/examples/tasks/Cargo.toml
@@ -22,9 +22,9 @@ scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 
+sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-core = { workspace = true }
 
 frame-benchmarking = { optional = true, workspace = true }
 
diff --git a/substrate/frame/executive/Cargo.toml b/substrate/frame/executive/Cargo.toml
index 76d084f49d9fcc5615630a01d14c17b9804f60bd..ee24a9fef13d791d32f00dc21b427a114a3e15f6 100644
--- a/substrate/frame/executive/Cargo.toml
+++ b/substrate/frame/executive/Cargo.toml
@@ -20,11 +20,11 @@ aquamarine = { workspace = true }
 codec = { features = [
 	"derive",
 ], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/fast-unstake/Cargo.toml b/substrate/frame/fast-unstake/Cargo.toml
index c1d0e80551c23b0eb8b8dc1b30f99a31619badc8..98a9655074e7c3f46340271af0108bfeab1fd2fc 100644
--- a/substrate/frame/fast-unstake/Cargo.toml
+++ b/substrate/frame/fast-unstake/Cargo.toml
@@ -22,23 +22,23 @@ scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 
+frame-election-provider-support = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-staking = { workspace = true }
-frame-election-provider-support = { workspace = true }
 
 frame-benchmarking = { optional = true, workspace = true }
 
 docify = { workspace = true }
 
 [dev-dependencies]
+pallet-balances = { workspace = true, default-features = true }
+pallet-staking = { workspace = true, default-features = true }
 pallet-staking-reward-curve = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
 sp-core = { workspace = true }
-substrate-test-utils = { workspace = true }
 sp-tracing = { workspace = true, default-features = true }
-pallet-staking = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
+substrate-test-utils = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/glutton/Cargo.toml b/substrate/frame/glutton/Cargo.toml
index 6717176ffc9547e733aca024881651ef1ca4d998..317a9ea8b7604275830c21d22b20529e5ca3bf9c 100644
--- a/substrate/frame/glutton/Cargo.toml
+++ b/substrate/frame/glutton/Cargo.toml
@@ -18,15 +18,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 blake2 = { workspace = true }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-log = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
+sp-inherents = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-inherents = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
diff --git a/substrate/frame/grandpa/Cargo.toml b/substrate/frame/grandpa/Cargo.toml
index 86ace358d05d7d7abbab7d8a38db77637d422078..4072d65b6267b291c7217226e5e8fb30365d991e 100644
--- a/substrate/frame/grandpa/Cargo.toml
+++ b/substrate/frame/grandpa/Cargo.toml
@@ -17,13 +17,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-authorship = { workspace = true }
 pallet-session = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
 sp-application-crypto = { features = ["serde"], workspace = true }
 sp-consensus-grandpa = { features = ["serde"], workspace = true }
 sp-core = { features = ["serde"], workspace = true }
diff --git a/substrate/frame/identity/Cargo.toml b/substrate/frame/identity/Cargo.toml
index bf974221b85739b80c79f759f2ed03486fb76544..4ea7f797d9ee5d73e24316d481a9625c54439d5a 100644
--- a/substrate/frame/identity/Cargo.toml
+++ b/substrate/frame/identity/Cargo.toml
@@ -18,11 +18,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
 enumflags2 = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/frame/im-online/Cargo.toml b/substrate/frame/im-online/Cargo.toml
index 6c32c8ae898ee9495b5b2699a0d52354629cae0d..179c4c3ce3b18062c93eda51e54a00eea5531051 100644
--- a/substrate/frame/im-online/Cargo.toml
+++ b/substrate/frame/im-online/Cargo.toml
@@ -17,12 +17,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-authorship = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
 sp-application-crypto = { features = ["serde"], workspace = true }
 sp-core = { features = ["serde"], workspace = true }
 sp-io = { workspace = true }
diff --git a/substrate/frame/indices/Cargo.toml b/substrate/frame/indices/Cargo.toml
index d81b2d5cabf178b44584c4f9e58a4e3ed0800c99..a0030b5b0edf82728cca7e9322cee4d364de4737 100644
--- a/substrate/frame/indices/Cargo.toml
+++ b/substrate/frame/indices/Cargo.toml
@@ -17,10 +17,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-keyring = { optional = true, workspace = true }
diff --git a/substrate/frame/insecure-randomness-collective-flip/Cargo.toml b/substrate/frame/insecure-randomness-collective-flip/Cargo.toml
index 1a47030812da7ce691ebd62469c1ffbeeb5a8953..1682b52dfbf4d4a35e072b73e128aaaae24392a5 100644
--- a/substrate/frame/insecure-randomness-collective-flip/Cargo.toml
+++ b/substrate/frame/insecure-randomness-collective-flip/Cargo.toml
@@ -17,10 +17,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-safe-mix = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+safe-mix = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
diff --git a/substrate/frame/lottery/Cargo.toml b/substrate/frame/lottery/Cargo.toml
index eb6e0b703d08676111d0d3904ac8b0887b35392d..23eb19c7ffa7d29634a5748e22ed8d376be87e2a 100644
--- a/substrate/frame/lottery/Cargo.toml
+++ b/substrate/frame/lottery/Cargo.toml
@@ -18,10 +18,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
diff --git a/substrate/frame/membership/Cargo.toml b/substrate/frame/membership/Cargo.toml
index 67aa3503ac0af7fae50a082ff5c381460bc6c4e1..738d09b4b354d73a283e9842abf12fff100b3273 100644
--- a/substrate/frame/membership/Cargo.toml
+++ b/substrate/frame/membership/Cargo.toml
@@ -17,11 +17,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
 sp-core = { features = ["serde"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
diff --git a/substrate/frame/merkle-mountain-range/Cargo.toml b/substrate/frame/merkle-mountain-range/Cargo.toml
index 4daa394a82d7a16174622f4b1768981b3c12f329..04f5ab64100d3f969d79fd9293ca10ffa964abc0 100644
--- a/substrate/frame/merkle-mountain-range/Cargo.toml
+++ b/substrate/frame/merkle-mountain-range/Cargo.toml
@@ -16,11 +16,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-mmr-primitives = { workspace = true }
@@ -28,8 +28,8 @@ sp-runtime = { workspace = true }
 
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
 itertools = { workspace = true }
+sp-tracing = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/message-queue/Cargo.toml b/substrate/frame/message-queue/Cargo.toml
index a6de61d70abf3a79f6e675f6b6e550c25301b11f..7b0de7c1e4ff867bd0d19a04428a02489e34dad4 100644
--- a/substrate/frame/message-queue/Cargo.toml
+++ b/substrate/frame/message-queue/Cargo.toml
@@ -13,15 +13,15 @@ workspace = true
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
+environmental = { workspace = true }
+log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
-log = { workspace = true }
-environmental = { workspace = true }
 
+sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-arithmetic = { workspace = true }
 sp-weights = { workspace = true }
 
 frame-benchmarking = { optional = true, workspace = true }
@@ -29,10 +29,10 @@ frame-support = { workspace = true }
 frame-system = { workspace = true }
 
 [dev-dependencies]
-sp-crypto-hashing = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
 rand_distr = { workspace = true }
+sp-crypto-hashing = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/metadata-hash-extension/Cargo.toml b/substrate/frame/metadata-hash-extension/Cargo.toml
index 8f4ba922984c800a04e351434369425dcb972e44..c7a417795ffee04eb4144749dcca595f8fed44ba 100644
--- a/substrate/frame/metadata-hash-extension/Cargo.toml
+++ b/substrate/frame/metadata-hash-extension/Cargo.toml
@@ -11,22 +11,22 @@ description = "FRAME signed extension for verifying the metadata hash"
 [dependencies]
 array-bytes = { workspace = true, default-features = true }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
-sp-runtime = { features = ["serde"], workspace = true }
+const-hex = { workspace = true }
+docify = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 log = { workspace = true }
-docify = { workspace = true }
-const-hex = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
+sp-runtime = { features = ["serde"], workspace = true }
 
 [dev-dependencies]
-substrate-wasm-builder = { features = ["metadata-hash"], workspace = true, default-features = true }
-substrate-test-runtime-client = { workspace = true }
-sp-api = { workspace = true, default-features = true }
-sp-transaction-pool = { workspace = true, default-features = true }
-merkleized-metadata = { workspace = true }
 frame-metadata = { features = ["current", "unstable"], workspace = true, default-features = true }
+merkleized-metadata = { workspace = true }
+sp-api = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
+sp-transaction-pool = { workspace = true, default-features = true }
+substrate-test-runtime-client = { workspace = true }
+substrate-wasm-builder = { features = ["metadata-hash"], workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/migrations/Cargo.toml b/substrate/frame/migrations/Cargo.toml
index a32e48e652805f91fabf340916351f6c27d9b79a..469592780beb8855691ca4a8b1438f5abf4c9d40 100644
--- a/substrate/frame/migrations/Cargo.toml
+++ b/substrate/frame/migrations/Cargo.toml
@@ -11,8 +11,8 @@ repository.workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { features = ["derive"], workspace = true }
 cfg-if = { workspace = true }
+codec = { features = ["derive"], workspace = true }
 docify = { workspace = true }
 impl-trait-for-tuples = { workspace = true }
 log = { workspace = true, default-features = true }
diff --git a/substrate/frame/multisig/Cargo.toml b/substrate/frame/multisig/Cargo.toml
index c96be908faef08ae6d7a6e0dfb892ccfeba45614..0d175617c9c23dedd5f2e72e806f187dc1e5e119 100644
--- a/substrate/frame/multisig/Cargo.toml
+++ b/substrate/frame/multisig/Cargo.toml
@@ -17,8 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame = { workspace = true, features = ["experimental", "runtime"] }
+scale-info = { features = ["derive"], workspace = true }
 
 # third party
 log = { workspace = true }
diff --git a/substrate/frame/nft-fractionalization/Cargo.toml b/substrate/frame/nft-fractionalization/Cargo.toml
index 6a064204b895a5553af93444e0b788f3309e8264..7f6df86ed0e5779d56c48c1fa334ede9e2a12b6c 100644
--- a/substrate/frame/nft-fractionalization/Cargo.toml
+++ b/substrate/frame/nft-fractionalization/Cargo.toml
@@ -17,13 +17,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-assets = { workspace = true }
 pallet-nfts = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
diff --git a/substrate/frame/nfts/Cargo.toml b/substrate/frame/nfts/Cargo.toml
index a97b49e56524568e1ae50b67bd8c9e8f2effe63d..18895018e1c5cd5cf90e22047e68a25294769e3e 100644
--- a/substrate/frame/nfts/Cargo.toml
+++ b/substrate/frame/nfts/Cargo.toml
@@ -18,11 +18,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { workspace = true }
 enumflags2 = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/nis/Cargo.toml b/substrate/frame/nis/Cargo.toml
index 78e086d0ed12a0c2fb951fe3684c17dd9e446668..ec1a5d93bcbaaaac93669eed46ffe211c751ff4b 100644
--- a/substrate/frame/nis/Cargo.toml
+++ b/substrate/frame/nis/Cargo.toml
@@ -17,10 +17,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/node-authorization/Cargo.toml b/substrate/frame/node-authorization/Cargo.toml
index 82aecc21d0b533973e81613b9e59637805438e80..17473649393411047ec3e2b56d0306e5c228a3ca 100644
--- a/substrate/frame/node-authorization/Cargo.toml
+++ b/substrate/frame/node-authorization/Cargo.toml
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/nomination-pools/Cargo.toml b/substrate/frame/nomination-pools/Cargo.toml
index aa90e4d81339e5af1b8656f3c0e6e4844f8b933c..a5e8da17eb23eea2af1cd578b8b6d0abcaac4121 100644
--- a/substrate/frame/nomination-pools/Cargo.toml
+++ b/substrate/frame/nomination-pools/Cargo.toml
@@ -26,11 +26,11 @@ scale-info = { features = [
 # FRAME
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-sp-runtime = { workspace = true }
-sp-staking = { workspace = true }
+log = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
-log = { workspace = true }
+sp-runtime = { workspace = true }
+sp-staking = { workspace = true }
 
 # Optional: use for testing and/or fuzzing
 pallet-balances = { optional = true, workspace = true }
diff --git a/substrate/frame/nomination-pools/benchmarking/Cargo.toml b/substrate/frame/nomination-pools/benchmarking/Cargo.toml
index 7dd826a912240f2f1b19b3dce4eaab0b7821cf84..0b3ac228e86f0e2910f5410f2dac5d5de58365f7 100644
--- a/substrate/frame/nomination-pools/benchmarking/Cargo.toml
+++ b/substrate/frame/nomination-pools/benchmarking/Cargo.toml
@@ -26,9 +26,9 @@ frame-election-provider-support = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-bags-list = { workspace = true }
-pallet-staking = { workspace = true }
 pallet-delegated-staking = { workspace = true }
 pallet-nomination-pools = { workspace = true }
+pallet-staking = { workspace = true }
 
 # Substrate Primitives
 sp-runtime = { workspace = true }
@@ -37,8 +37,8 @@ sp-staking = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true }
-pallet-timestamp = { workspace = true, default-features = true }
 pallet-staking-reward-curve = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
 
diff --git a/substrate/frame/nomination-pools/fuzzer/Cargo.toml b/substrate/frame/nomination-pools/fuzzer/Cargo.toml
index e1518ed099aee7a71aeda2e19868378beee65d36..2f84004ece94e8759c0c8ef907873bfeb4aabe2d 100644
--- a/substrate/frame/nomination-pools/fuzzer/Cargo.toml
+++ b/substrate/frame/nomination-pools/fuzzer/Cargo.toml
@@ -21,15 +21,15 @@ honggfuzz = { workspace = true }
 
 pallet-nomination-pools = { features = ["fuzzing"], workspace = true, default-features = true }
 
-frame-system = { workspace = true, default-features = true }
 frame-support = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 
-sp-runtime = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 
-rand = { features = ["small_rng"], workspace = true, default-features = true }
 log = { workspace = true, default-features = true }
+rand = { features = ["small_rng"], workspace = true, default-features = true }
 
 [[bin]]
 name = "call"
diff --git a/substrate/frame/nomination-pools/runtime-api/Cargo.toml b/substrate/frame/nomination-pools/runtime-api/Cargo.toml
index 6de9fc8c88444fc0760bb11be320b7b961ffab7e..337cc31c7cbb8e7a4fc4b6823d1e27b0ab978729 100644
--- a/substrate/frame/nomination-pools/runtime-api/Cargo.toml
+++ b/substrate/frame/nomination-pools/runtime-api/Cargo.toml
@@ -17,8 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-sp-api = { workspace = true }
 pallet-nomination-pools = { workspace = true }
+sp-api = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/nomination-pools/test-delegate-stake/Cargo.toml b/substrate/frame/nomination-pools/test-delegate-stake/Cargo.toml
index 70e1591409b8d90549fcc86b9b636ea31dbb80c0..fe3743d7e5dac443a801ac88b8c2605c7235ac2e 100644
--- a/substrate/frame/nomination-pools/test-delegate-stake/Cargo.toml
+++ b/substrate/frame/nomination-pools/test-delegate-stake/Cargo.toml
@@ -19,23 +19,23 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = ["derive"], workspace = true, default-features = true }
 scale-info = { features = ["derive"], workspace = true, default-features = true }
 
-sp-runtime = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 sp-staking = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = true }
 
-frame-system = { workspace = true, default-features = true }
-frame-support = { features = ["experimental"], workspace = true, default-features = true }
 frame-election-provider-support = { workspace = true, default-features = true }
+frame-support = { features = ["experimental"], workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 
-pallet-timestamp = { workspace = true, default-features = true }
+pallet-bags-list = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
-pallet-staking = { workspace = true, default-features = true }
 pallet-delegated-staking = { workspace = true, default-features = true }
-pallet-bags-list = { workspace = true, default-features = true }
-pallet-staking-reward-curve = { workspace = true, default-features = true }
 pallet-nomination-pools = { workspace = true, default-features = true }
+pallet-staking = { workspace = true, default-features = true }
+pallet-staking-reward-curve = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
 
-sp-tracing = { workspace = true, default-features = true }
 log = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
diff --git a/substrate/frame/nomination-pools/test-transfer-stake/Cargo.toml b/substrate/frame/nomination-pools/test-transfer-stake/Cargo.toml
index 7398404c23515e763f061a9963797e57ece05772..2cdc4c41a0836223c2231e2428947f560f8a1d45 100644
--- a/substrate/frame/nomination-pools/test-transfer-stake/Cargo.toml
+++ b/substrate/frame/nomination-pools/test-transfer-stake/Cargo.toml
@@ -19,22 +19,22 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = ["derive"], workspace = true, default-features = true }
 scale-info = { features = ["derive"], workspace = true, default-features = true }
 
-sp-runtime = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 sp-staking = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = true }
 
-frame-system = { workspace = true, default-features = true }
-frame-support = { workspace = true, default-features = true }
 frame-election-provider-support = { workspace = true, default-features = true }
+frame-support = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 
-pallet-timestamp = { workspace = true, default-features = true }
+pallet-bags-list = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
+pallet-nomination-pools = { workspace = true, default-features = true }
 pallet-staking = { workspace = true, default-features = true }
-pallet-bags-list = { workspace = true, default-features = true }
 pallet-staking-reward-curve = { workspace = true, default-features = true }
-pallet-nomination-pools = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
 
-sp-tracing = { workspace = true, default-features = true }
 log = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
diff --git a/substrate/frame/offences/Cargo.toml b/substrate/frame/offences/Cargo.toml
index 98c320e1f8088d824793501023dc0fad57f347f4..4dd9d7f10c9f231ab019d31c0ef2254848b82755 100644
--- a/substrate/frame/offences/Cargo.toml
+++ b/substrate/frame/offences/Cargo.toml
@@ -17,12 +17,12 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { optional = true, workspace = true, default-features = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-balances = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
 sp-runtime = { workspace = true }
 sp-staking = { workspace = true }
 
diff --git a/substrate/frame/offences/benchmarking/Cargo.toml b/substrate/frame/offences/benchmarking/Cargo.toml
index 28c7895180c4b4ee3516c9c5a20059608844e596..76b167ebdb332f907c342c115e86961625070197 100644
--- a/substrate/frame/offences/benchmarking/Cargo.toml
+++ b/substrate/frame/offences/benchmarking/Cargo.toml
@@ -17,11 +17,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { workspace = true }
 frame-election-provider-support = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-babe = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-grandpa = { workspace = true }
@@ -29,9 +29,9 @@ pallet-im-online = { workspace = true }
 pallet-offences = { workspace = true }
 pallet-session = { workspace = true }
 pallet-staking = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 sp-staking = { workspace = true }
-log = { workspace = true }
 
 [dev-dependencies]
 pallet-staking-reward-curve = { workspace = true, default-features = true }
diff --git a/substrate/frame/paged-list/Cargo.toml b/substrate/frame/paged-list/Cargo.toml
index a680139c5fdc2011b37fccaf33eb1bb4c12d1470..da029bdd7423f1a093933f9865ab48b0c4892012 100644
--- a/substrate/frame/paged-list/Cargo.toml
+++ b/substrate/frame/paged-list/Cargo.toml
@@ -23,10 +23,10 @@ frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 
-sp-runtime = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-metadata-ir = { optional = true, workspace = true }
+sp-runtime = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/paged-list/fuzzer/Cargo.toml b/substrate/frame/paged-list/fuzzer/Cargo.toml
index d0108254ed2dfb958fa887aaf7a24cd130ce7a67..7e6162df09ba6bbfbc3a91ccfcc5649446fa0041 100644
--- a/substrate/frame/paged-list/fuzzer/Cargo.toml
+++ b/substrate/frame/paged-list/fuzzer/Cargo.toml
@@ -21,5 +21,5 @@ arbitrary = { workspace = true }
 honggfuzz = { workspace = true }
 
 frame-support = { features = ["std"], workspace = true }
-sp-io = { features = ["std"], workspace = true }
 pallet-paged-list = { features = ["std"], workspace = true }
+sp-io = { features = ["std"], workspace = true }
diff --git a/substrate/frame/parameters/Cargo.toml b/substrate/frame/parameters/Cargo.toml
index a97ba1172a503df2efb2f820ef8995f8ff9f4a65..dda218b618c458fe2f06ce2d76fa6af3551564c4 100644
--- a/substrate/frame/parameters/Cargo.toml
+++ b/substrate/frame/parameters/Cargo.toml
@@ -9,22 +9,22 @@ edition.workspace = true
 
 [dependencies]
 codec = { features = ["max-encoded-len"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
+docify = { workspace = true }
 paste = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
-docify = { workspace = true }
 
+frame-benchmarking = { optional = true, workspace = true }
 frame-support = { features = ["experimental"], workspace = true }
 frame-system = { workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
 
 [dev-dependencies]
+pallet-balances = { features = ["std"], workspace = true, default-features = true }
+pallet-example-basic = { features = ["std"], workspace = true, default-features = true }
 sp-core = { features = ["std"], workspace = true, default-features = true }
 sp-io = { features = ["std"], workspace = true, default-features = true }
-pallet-example-basic = { features = ["std"], workspace = true, default-features = true }
-pallet-balances = { features = ["std"], workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/preimage/Cargo.toml b/substrate/frame/preimage/Cargo.toml
index 1356ac403d38c1a4adc410ab8e792051c00c3c0c..fae6627b6315e36538443f57be5531e244c8470a 100644
--- a/substrate/frame/preimage/Cargo.toml
+++ b/substrate/frame/preimage/Cargo.toml
@@ -13,14 +13,14 @@ workspace = true
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { optional = true, workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-log = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
diff --git a/substrate/frame/proxy/Cargo.toml b/substrate/frame/proxy/Cargo.toml
index 8897c66419c7a59507ceca79cb7fe3eaffd1dfb9..a36b2c1cb9c3af5dc545f35d4788d8a043f1a77e 100644
--- a/substrate/frame/proxy/Cargo.toml
+++ b/substrate/frame/proxy/Cargo.toml
@@ -17,8 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["max-encoded-len"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame = { workspace = true, features = ["experimental", "runtime"] }
+scale-info = { features = ["derive"], workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
diff --git a/substrate/frame/ranked-collective/Cargo.toml b/substrate/frame/ranked-collective/Cargo.toml
index eca59cf7fc22345f723460b78fa325eff1a303fe..78a02bec8e97618f723b31560c1618ed931836e1 100644
--- a/substrate/frame/ranked-collective/Cargo.toml
+++ b/substrate/frame/ranked-collective/Cargo.toml
@@ -17,16 +17,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-impl-trait-for-tuples = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/recovery/Cargo.toml b/substrate/frame/recovery/Cargo.toml
index 44335e8f575c879a4bd316c47507e1168221e316..4f3a734d9868f6b67334da6fd90d0ef7d9b65694 100644
--- a/substrate/frame/recovery/Cargo.toml
+++ b/substrate/frame/recovery/Cargo.toml
@@ -17,10 +17,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/frame/referenda/Cargo.toml b/substrate/frame/referenda/Cargo.toml
index e9b4eb04ed51cf9ae86ef55b6f978c2aa90eac1e..0f35dc74382e3916b5a60f62f173ff6b383e82fc 100644
--- a/substrate/frame/referenda/Cargo.toml
+++ b/substrate/frame/referenda/Cargo.toml
@@ -20,15 +20,15 @@ assert_matches = { optional = true, workspace = true }
 codec = { features = [
 	"derive",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
-sp-arithmetic = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
+sp-arithmetic = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-log = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
diff --git a/substrate/frame/remark/Cargo.toml b/substrate/frame/remark/Cargo.toml
index 487bada593cd7ebdb520ea70f535114b6467bcd3..a40b577b52ea448c707a905305998187860bd3c5 100644
--- a/substrate/frame/remark/Cargo.toml
+++ b/substrate/frame/remark/Cargo.toml
@@ -17,11 +17,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { optional = true, workspace = true, default-features = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml
index 5d2bfb4f795ebfb21ba88447e5776fd918c75ec4..fa008f8e836a1c9eb7a4a09a9e96c92d4e829f26 100644
--- a/substrate/frame/revive/Cargo.toml
+++ b/substrate/frame/revive/Cargo.toml
@@ -17,29 +17,29 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+codec = { features = ["derive", "max-encoded-len"], workspace = true }
+derive_more = { workspace = true }
 environmental = { workspace = true }
+ethereum-types = { workspace = true, features = ["codec", "rlp", "serialize"] }
+hex = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
+log = { workspace = true }
 paste = { workspace = true }
 polkavm = { version = "0.18.0", default-features = false }
-codec = { features = ["derive", "max-encoded-len"], workspace = true }
+rlp = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-log = { workspace = true }
 serde = { features = [
 	"alloc",
 	"derive",
 ], workspace = true, default-features = false }
-impl-trait-for-tuples = { workspace = true }
-rlp = { workspace = true }
-derive_more = { workspace = true }
-hex = { workspace = true }
-ethereum-types = { workspace = true, features = ["codec", "rlp", "serialize"] }
 
 # Polkadot SDK Dependencies
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-revive-fixtures = { workspace = true, optional = true }
-pallet-revive-uapi = { workspace = true, features = ["scale"] }
 pallet-revive-proc-macro = { workspace = true }
+pallet-revive-uapi = { workspace = true, features = ["scale"] }
 pallet-transaction-payment = { workspace = true }
 sp-api = { workspace = true }
 sp-arithmetic = { workspace = true }
@@ -47,26 +47,26 @@ sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
-xcm = { workspace = true }
-xcm-builder = { workspace = true }
 subxt-signer = { workspace = true, optional = true, features = [
 	"unstable-eth",
 ] }
+xcm = { workspace = true }
+xcm-builder = { workspace = true }
 
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
+hex-literal = { workspace = true }
 pretty_assertions = { workspace = true }
 secp256k1 = { workspace = true, features = ["recovery"] }
 serde_json = { workspace = true }
-hex-literal = { workspace = true }
 
 # Polkadot SDK Dependencies
 pallet-balances = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
-pallet-utility = { workspace = true, default-features = true }
 pallet-proxy = { workspace = true, default-features = true }
 pallet-revive-fixtures = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
+pallet-utility = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 xcm-builder = { workspace = true, default-features = true }
diff --git a/substrate/frame/revive/fixtures/Cargo.toml b/substrate/frame/revive/fixtures/Cargo.toml
index 1095f962ac1b356e3a1a8d62016e1388933ff0ed..e17bc88a3847a660500671d85c234dfb6d5e0b80 100644
--- a/substrate/frame/revive/fixtures/Cargo.toml
+++ b/substrate/frame/revive/fixtures/Cargo.toml
@@ -15,14 +15,14 @@ exclude-from-umbrella = true
 workspace = true
 
 [dependencies]
+anyhow = { workspace = true, default-features = true, optional = true }
 sp-core = { workspace = true, default-features = true, optional = true }
 sp-io = { workspace = true, default-features = true, optional = true }
-anyhow = { workspace = true, default-features = true, optional = true }
 
 [build-dependencies]
-toml = { workspace = true }
-polkavm-linker = { version = "0.18.0" }
 anyhow = { workspace = true, default-features = true }
+polkavm-linker = { version = "0.18.0" }
+toml = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/revive/mock-network/Cargo.toml b/substrate/frame/revive/mock-network/Cargo.toml
index 0d8814f81a9c9c384c02c6a470a628b73e9ad2d5..1ebeb2c95db7f42db9cd88bdb904607ef1639e6b 100644
--- a/substrate/frame/revive/mock-network/Cargo.toml
+++ b/substrate/frame/revive/mock-network/Cargo.toml
@@ -18,9 +18,9 @@ frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-assets = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
+pallet-message-queue = { workspace = true, default-features = true }
 pallet-revive = { workspace = true, default-features = true }
 pallet-revive-uapi = { workspace = true }
-pallet-message-queue = { workspace = true, default-features = true }
 pallet-timestamp = { workspace = true, default-features = true }
 pallet-xcm = { workspace = true }
 polkadot-parachain-primitives = { workspace = true, default-features = true }
@@ -38,8 +38,8 @@ xcm-simulator = { workspace = true, default-features = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
-pretty_assertions = { workspace = true }
 pallet-revive-fixtures = { workspace = true }
+pretty_assertions = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/revive/rpc/Cargo.toml b/substrate/frame/revive/rpc/Cargo.toml
index 31b8f505dedcd01df507246b1250e799a859e246..cfaaa102fc3de2793e36ef1d8bd93418c457ba17 100644
--- a/substrate/frame/revive/rpc/Cargo.toml
+++ b/substrate/frame/revive/rpc/Cargo.toml
@@ -38,37 +38,37 @@ path = "examples/rust/remark-extrinsic.rs"
 required-features = ["example"]
 
 [dependencies]
-clap = { workspace = true, features = ["derive"] }
 anyhow = { workspace = true }
+clap = { workspace = true, features = ["derive"] }
+codec = { workspace = true, features = ["derive"] }
+ethabi = { version = "18.0.0" }
 futures = { workspace = true, features = ["thread-pool"] }
+hex = { workspace = true }
 jsonrpsee = { workspace = true, features = ["full"] }
-thiserror = { workspace = true }
-sp-crypto-hashing = { workspace = true }
-subxt = { workspace = true, default-features = true, features = ["reconnecting-rpc-client"] }
-tokio = { workspace = true, features = ["full"] }
-codec = { workspace = true, features = ["derive"] }
 log = { workspace = true }
 pallet-revive = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
-sp-weights = { workspace = true, default-features = true }
+prometheus-endpoint = { workspace = true, default-features = true }
+rlp = { workspace = true, optional = true }
+sc-cli = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true }
 sc-rpc-api = { workspace = true, default-features = true }
-sc-cli = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
-prometheus-endpoint = { workspace = true, default-features = true }
-rlp = { workspace = true, optional = true }
+sp-core = { workspace = true, default-features = true }
+sp-crypto-hashing = { workspace = true }
+sp-weights = { workspace = true, default-features = true }
+subxt = { workspace = true, default-features = true, features = ["reconnecting-rpc-client"] }
 subxt-signer = { workspace = true, optional = true, features = [
 	"unstable-eth",
 ] }
-hex = { workspace = true }
-ethabi = { version = "18.0.0" }
+thiserror = { workspace = true }
+tokio = { workspace = true, features = ["full"] }
 
 [features]
 example = ["rlp", "subxt-signer"]
 
 [dev-dependencies]
 env_logger = { workspace = true }
-static_init = { workspace = true }
 pallet-revive-fixtures = { workspace = true, default-features = true }
+static_init = { workspace = true }
 substrate-cli-test-utils = { workspace = true }
 subxt-signer = { workspace = true, features = ["unstable-eth"] }
diff --git a/substrate/frame/revive/uapi/Cargo.toml b/substrate/frame/revive/uapi/Cargo.toml
index 948c2c6e4f832f2643b9840309473bba1e7d77b7..7241d667fcdc75c4dbd6e2c5f3a6a02efd1835aa 100644
--- a/substrate/frame/revive/uapi/Cargo.toml
+++ b/substrate/frame/revive/uapi/Cargo.toml
@@ -12,14 +12,14 @@ description = "Exposes all the host functions that a contract can import."
 workspace = true
 
 [dependencies]
-paste = { workspace = true }
 bitflags = { workspace = true }
-scale-info = { features = ["derive"], optional = true, workspace = true }
 codec = { features = [
 	"derive",
 	"max-encoded-len",
 ], optional = true, workspace = true }
 pallet-revive-proc-macro = { workspace = true }
+paste = { workspace = true }
+scale-info = { features = ["derive"], optional = true, workspace = true }
 
 [target.'cfg(target_arch = "riscv64")'.dependencies]
 polkavm-derive = { version = "0.18.0" }
diff --git a/substrate/frame/root-offences/Cargo.toml b/substrate/frame/root-offences/Cargo.toml
index f80fed11b97101179e07695b3bb5a4e93017f7c1..dedde9956b6f4c9027692809bb23a87ceefe4d5a 100644
--- a/substrate/frame/root-offences/Cargo.toml
+++ b/substrate/frame/root-offences/Cargo.toml
@@ -29,8 +29,8 @@ sp-staking = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
 pallet-staking-reward-curve = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
 
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true }
diff --git a/substrate/frame/root-testing/Cargo.toml b/substrate/frame/root-testing/Cargo.toml
index ee3ce80110090e8cd0fdef08b223ff5e6011337c..fd0f4da2e80c3eb590c0404cbf9c86b31c437608 100644
--- a/substrate/frame/root-testing/Cargo.toml
+++ b/substrate/frame/root-testing/Cargo.toml
@@ -17,9 +17,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/safe-mode/Cargo.toml b/substrate/frame/safe-mode/Cargo.toml
index e7f165ae67d8c08287db91c95c774feaf332df5e..3f1f6bc1f1d649e06febc12c1c2b248600806bcf 100644
--- a/substrate/frame/safe-mode/Cargo.toml
+++ b/substrate/frame/safe-mode/Cargo.toml
@@ -20,20 +20,20 @@ docify = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+pallet-balances = { optional = true, workspace = true }
+pallet-proxy = { optional = true, workspace = true }
+pallet-utility = { optional = true, workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 sp-arithmetic = { workspace = true }
 sp-runtime = { workspace = true }
-pallet-balances = { optional = true, workspace = true }
-pallet-utility = { optional = true, workspace = true }
-pallet-proxy = { optional = true, workspace = true }
 
 [dev-dependencies]
-sp-core = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
+frame-support = { features = ["experimental"], workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
-pallet-utility = { workspace = true, default-features = true }
 pallet-proxy = { workspace = true, default-features = true }
-frame-support = { features = ["experimental"], workspace = true, default-features = true }
+pallet-utility = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/salary/Cargo.toml b/substrate/frame/salary/Cargo.toml
index 9e4cf06288dd5e624119541d2e58c8b09acfabc9..b3ed95bf1de5bc42bcf3bb22b6d747240e337cac 100644
--- a/substrate/frame/salary/Cargo.toml
+++ b/substrate/frame/salary/Cargo.toml
@@ -17,16 +17,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+pallet-ranked-collective = { optional = true, workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-pallet-ranked-collective = { optional = true, workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/sassafras/Cargo.toml b/substrate/frame/sassafras/Cargo.toml
index 7eb2bda96ffc3fb707772cb2c162c873bedfd087..dd091b6f8ed79c4686ad9643be4c5da14a526530 100644
--- a/substrate/frame/sassafras/Cargo.toml
+++ b/substrate/frame/sassafras/Cargo.toml
@@ -18,11 +18,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-consensus-sassafras = { features = ["serde"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/scheduler/Cargo.toml b/substrate/frame/scheduler/Cargo.toml
index 1432ada913350e9715e3e854a324fde771aaaee8..0506470e72c32fafe01c906ffc8e0fe2a3ba389c 100644
--- a/substrate/frame/scheduler/Cargo.toml
+++ b/substrate/frame/scheduler/Cargo.toml
@@ -14,15 +14,15 @@ workspace = true
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
+docify = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-weights = { workspace = true }
-docify = { workspace = true }
 
 [dev-dependencies]
 pallet-preimage = { workspace = true, default-features = true }
diff --git a/substrate/frame/scored-pool/Cargo.toml b/substrate/frame/scored-pool/Cargo.toml
index d945ef42a47b0ba9419782881d0f9de2c372120d..227868fa2a4f52344dcd059df00283cff4776c93 100644
--- a/substrate/frame/scored-pool/Cargo.toml
+++ b/substrate/frame/scored-pool/Cargo.toml
@@ -17,9 +17,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/frame/session/Cargo.toml b/substrate/frame/session/Cargo.toml
index b82112681e679ad0fc0ddbcf32f8f8944ca4c766..737678bea8a3b53b01321e544d14a8b7aaa261bc 100644
--- a/substrate/frame/session/Cargo.toml
+++ b/substrate/frame/session/Cargo.toml
@@ -17,19 +17,19 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-impl-trait-for-tuples = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
+log = { workspace = true }
 pallet-timestamp = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
 sp-core = { features = ["serde"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
 sp-session = { workspace = true }
 sp-staking = { features = ["serde"], workspace = true }
-sp-trie = { optional = true, workspace = true }
 sp-state-machine = { workspace = true }
+sp-trie = { optional = true, workspace = true }
 
 [features]
 default = ["historical", "std"]
diff --git a/substrate/frame/session/benchmarking/Cargo.toml b/substrate/frame/session/benchmarking/Cargo.toml
index 264bc10a33f6be356d7b745dd48b287f331b94f4..72e4b3deabfd0f7cec95b9aaf44242ee39e13643 100644
--- a/substrate/frame/session/benchmarking/Cargo.toml
+++ b/substrate/frame/session/benchmarking/Cargo.toml
@@ -17,22 +17,22 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-rand = { features = ["std_rng"], workspace = true }
 frame-benchmarking = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-session = { workspace = true }
 pallet-staking = { workspace = true }
+rand = { features = ["std_rng"], workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
 
 [dev-dependencies]
 codec = { features = ["derive"], workspace = true, default-features = true }
-scale-info = { workspace = true, default-features = true }
 frame-election-provider-support = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
 pallet-staking-reward-curve = { workspace = true, default-features = true }
 pallet-timestamp = { workspace = true, default-features = true }
+scale-info = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
 
diff --git a/substrate/frame/society/Cargo.toml b/substrate/frame/society/Cargo.toml
index 555dee68ba01ee8eea4fcc789c1660b7c61078e2..d5860518fdda84c7ea6bd602ddead60f80bb20e9 100644
--- a/substrate/frame/society/Cargo.toml
+++ b/substrate/frame/society/Cargo.toml
@@ -16,17 +16,17 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+codec = { features = ["derive"], workspace = true }
 log = { workspace = true }
 rand_chacha = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-codec = { features = ["derive"], workspace = true }
 
-sp-io = { workspace = true }
-sp-arithmetic = { workspace = true }
-sp-runtime = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+sp-arithmetic = { workspace = true }
+sp-io = { workspace = true }
+sp-runtime = { workspace = true }
 
 [dev-dependencies]
 frame-support-test = { workspace = true }
diff --git a/substrate/frame/staking/Cargo.toml b/substrate/frame/staking/Cargo.toml
index a6a0ccd3b0a730e3ef267da349d7912c04c717c0..22176b6d720b201583905f59780c19aa7c33d2f4 100644
--- a/substrate/frame/staking/Cargo.toml
+++ b/substrate/frame/staking/Cargo.toml
@@ -16,40 +16,40 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { features = ["alloc", "derive"], workspace = true }
 codec = { features = [
 	"derive",
 ], workspace = true }
-scale-info = { features = ["derive", "serde"], workspace = true }
-sp-io = { workspace = true }
-sp-runtime = { features = ["serde"], workspace = true }
-sp-staking = { features = ["serde"], workspace = true }
+frame-election-provider-support = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+pallet-authorship = { workspace = true }
 pallet-session = { features = [
 	"historical",
 ], workspace = true }
-pallet-authorship = { workspace = true }
+scale-info = { features = ["derive", "serde"], workspace = true }
+serde = { features = ["alloc", "derive"], workspace = true }
 sp-application-crypto = { features = ["serde"], workspace = true }
-frame-election-provider-support = { workspace = true }
-log = { workspace = true }
+sp-io = { workspace = true }
+sp-runtime = { features = ["serde"], workspace = true }
+sp-staking = { features = ["serde"], workspace = true }
 
 # Optional imports for benchmarking
 frame-benchmarking = { optional = true, workspace = true }
 rand_chacha = { optional = true, workspace = true }
 
 [dev-dependencies]
+frame-benchmarking = { workspace = true, default-features = true }
+frame-election-provider-support = { workspace = true, default-features = true }
+pallet-bags-list = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
+pallet-staking-reward-curve = { workspace = true, default-features = true }
+pallet-timestamp = { workspace = true, default-features = true }
+rand_chacha = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-npos-elections = { workspace = true, default-features = true }
-pallet-timestamp = { workspace = true, default-features = true }
-pallet-staking-reward-curve = { workspace = true, default-features = true }
-pallet-bags-list = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 substrate-test-utils = { workspace = true }
-frame-benchmarking = { workspace = true, default-features = true }
-frame-election-provider-support = { workspace = true, default-features = true }
-rand_chacha = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/state-trie-migration/Cargo.toml b/substrate/frame/state-trie-migration/Cargo.toml
index 8c82bc38da97d82a0e9814b30b7d8a1bb9cfe4ac..1f1f6fc5be3ae5cf152912ccbac64a7685f09ce4 100644
--- a/substrate/frame/state-trie-migration/Cargo.toml
+++ b/substrate/frame/state-trie-migration/Cargo.toml
@@ -16,25 +16,25 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { optional = true, workspace = true, default-features = true }
-thousands = { optional = true, workspace = true }
-zstd = { optional = true, workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 remote-externalities = { optional = true, workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 substrate-state-trie-migration-rpc = { optional = true, workspace = true, default-features = true }
+thousands = { optional = true, workspace = true }
+zstd = { optional = true, workspace = true }
 
 [dev-dependencies]
-parking_lot = { workspace = true, default-features = true }
-tokio = { features = ["macros"], workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
+parking_lot = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
+tokio = { features = ["macros"], workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/statement/Cargo.toml b/substrate/frame/statement/Cargo.toml
index e601881cd7202bc49fd7dbda74f52b292008213c..b1449fa244162894218e1106b1546abf430c78a1 100644
--- a/substrate/frame/statement/Cargo.toml
+++ b/substrate/frame/statement/Cargo.toml
@@ -16,15 +16,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-sp-statement-store = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-api = { workspace = true }
-sp-runtime = { workspace = true }
-sp-io = { workspace = true }
 sp-core = { workspace = true }
-log = { workspace = true }
+sp-io = { workspace = true }
+sp-runtime = { workspace = true }
+sp-statement-store = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
diff --git a/substrate/frame/sudo/Cargo.toml b/substrate/frame/sudo/Cargo.toml
index 9b362019b29bc6890d44543f75f8f531311d085a..e2096bf0668add3abb8227a5c89e83449f3eea65 100644
--- a/substrate/frame/sudo/Cargo.toml
+++ b/substrate/frame/sudo/Cargo.toml
@@ -18,9 +18,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/frame/support/Cargo.toml b/substrate/frame/support/Cargo.toml
index 4348bd27560549e31aaf2ae00f6c191f4fea0723..1f4fdd5d46cd99f590745c97679ac85fb2c621dd 100644
--- a/substrate/frame/support/Cargo.toml
+++ b/substrate/frame/support/Cargo.toml
@@ -18,59 +18,59 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 array-bytes = { workspace = true }
 binary-merkle-tree.workspace = true
-serde = { features = ["alloc", "derive"], workspace = true }
+bitflags = { workspace = true }
 codec = { features = [
 	"derive",
 	"max-encoded-len",
 ], workspace = true }
-scale-info = { features = [
-	"derive",
-], workspace = true }
+docify = { workspace = true }
+environmental = { workspace = true }
 frame-metadata = { features = [
 	"current",
 	"unstable",
 ], workspace = true }
+frame-support-procedural = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
+k256 = { features = ["ecdsa"], workspace = true }
+log = { workspace = true }
+macro_magic = { workspace = true }
+paste = { workspace = true, default-features = true }
+scale-info = { features = [
+	"derive",
+], workspace = true }
+serde = { features = ["alloc", "derive"], workspace = true }
+serde_json = { features = ["alloc"], workspace = true }
+smallvec = { workspace = true, default-features = true }
 sp-api = { features = [
 	"frame-metadata",
 ], workspace = true }
-sp-std = { workspace = true }
-sp-io = { workspace = true }
-sp-runtime = { features = ["serde"], workspace = true }
-sp-tracing = { workspace = true }
-sp-core = { workspace = true }
 sp-arithmetic = { workspace = true }
-sp-inherents = { workspace = true }
-sp-staking = { workspace = true }
-sp-weights = { workspace = true }
+sp-core = { workspace = true }
+sp-crypto-hashing-proc-macro = { workspace = true, default-features = true }
 sp-debug-derive = { workspace = true }
+sp-genesis-builder = { workspace = true }
+sp-inherents = { workspace = true }
+sp-io = { workspace = true }
 sp-metadata-ir = { workspace = true }
-sp-trie = { workspace = true }
-tt-call = { workspace = true }
-macro_magic = { workspace = true }
-frame-support-procedural = { workspace = true }
-paste = { workspace = true, default-features = true }
+sp-runtime = { features = ["serde"], workspace = true }
+sp-staking = { workspace = true }
 sp-state-machine = { optional = true, workspace = true }
-bitflags = { workspace = true }
-impl-trait-for-tuples = { workspace = true }
-smallvec = { workspace = true, default-features = true }
-log = { workspace = true }
-sp-crypto-hashing-proc-macro = { workspace = true, default-features = true }
-k256 = { features = ["ecdsa"], workspace = true }
-environmental = { workspace = true }
-sp-genesis-builder = { workspace = true }
-serde_json = { features = ["alloc"], workspace = true }
-docify = { workspace = true }
+sp-std = { workspace = true }
+sp-tracing = { workspace = true }
+sp-trie = { workspace = true }
+sp-weights = { workspace = true }
 static_assertions = { workspace = true, default-features = true }
+tt-call = { workspace = true }
 
 aquamarine = { workspace = true }
 
 [dev-dependencies]
+Inflector = { workspace = true }
 assert_matches = { workspace = true }
-pretty_assertions = { workspace = true }
-sp-timestamp = { workspace = true }
 frame-system = { workspace = true, default-features = true }
+pretty_assertions = { workspace = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
-Inflector = { workspace = true }
+sp-timestamp = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/support/procedural/Cargo.toml b/substrate/frame/support/procedural/Cargo.toml
index 51790062b2c2a8cfd181f7b05563073b81329ceb..624562187617dc901e85dadcea5358ecdfeb8ab6 100644
--- a/substrate/frame/support/procedural/Cargo.toml
+++ b/substrate/frame/support/procedural/Cargo.toml
@@ -18,36 +18,36 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-derive-syn-parse = { workspace = true }
-docify = { workspace = true }
 Inflector = { workspace = true }
 cfg-expr = { workspace = true }
-itertools = { workspace = true }
-proc-macro2 = { workspace = true }
-quote = { workspace = true }
-syn = { features = ["full", "parsing", "visit-mut"], workspace = true }
+derive-syn-parse = { workspace = true }
+docify = { workspace = true }
+expander = { workspace = true }
 frame-support-procedural-tools = { workspace = true, default-features = true }
+itertools = { workspace = true }
 macro_magic = { features = ["proc_support"], workspace = true }
 proc-macro-warning = { workspace = true }
-expander = { workspace = true }
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
 sp-crypto-hashing = { workspace = true }
+syn = { features = ["full", "parsing", "visit-mut"], workspace = true }
 
 [dev-dependencies]
 codec = { features = [
 	"derive",
 	"max-encoded-len",
 ], workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+pretty_assertions = { workspace = true }
 regex = { workspace = true }
-sp-metadata-ir = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
+sp-metadata-ir = { workspace = true }
 sp-runtime = { features = [
 	"serde",
 ], workspace = true }
-frame-system = { workspace = true }
-frame-support = { workspace = true }
-pretty_assertions = { workspace = true }
 static_assertions = { workspace = true }
 
 [features]
diff --git a/substrate/frame/support/procedural/tools/Cargo.toml b/substrate/frame/support/procedural/tools/Cargo.toml
index e61e17e8ac75cbd36a4aebebb7490fb2e0f4cc6e..cbb2fde9e816afe536bfa70ea2a4f08e42e65261 100644
--- a/substrate/frame/support/procedural/tools/Cargo.toml
+++ b/substrate/frame/support/procedural/tools/Cargo.toml
@@ -15,8 +15,8 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+frame-support-procedural-tools-derive = { workspace = true, default-features = true }
 proc-macro-crate = { workspace = true }
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
 syn = { features = ["extra-traits", "full", "visit"], workspace = true }
-frame-support-procedural-tools-derive = { workspace = true, default-features = true }
diff --git a/substrate/frame/support/test/Cargo.toml b/substrate/frame/support/test/Cargo.toml
index 17ee3130b7417ece13155a61dfa7aae03ab6d302..ca122e6bd5446bc0d45e526fd7ba588a9ceda9be 100644
--- a/substrate/frame/support/test/Cargo.toml
+++ b/substrate/frame/support/test/Cargo.toml
@@ -15,26 +15,26 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-static_assertions = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
+frame-benchmarking = { workspace = true }
+frame-executive = { workspace = true }
 frame-metadata = { features = ["current", "unstable"], workspace = true }
+frame-support = { features = ["experimental"], workspace = true }
+frame-system = { workspace = true }
+pretty_assertions = { workspace = true }
+rustversion = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["derive"], workspace = true }
 sp-api = { workspace = true }
 sp-arithmetic = { workspace = true }
+sp-core = { workspace = true }
 sp-io = { workspace = true }
-sp-state-machine = { optional = true, workspace = true, default-features = true }
-frame-support = { features = ["experimental"], workspace = true }
-frame-benchmarking = { workspace = true }
+sp-metadata-ir = { workspace = true }
 sp-runtime = { workspace = true }
-sp-core = { workspace = true }
+sp-state-machine = { optional = true, workspace = true, default-features = true }
 sp-version = { workspace = true }
-sp-metadata-ir = { workspace = true }
+static_assertions = { workspace = true, default-features = true }
 trybuild = { features = ["diff"], workspace = true }
-pretty_assertions = { workspace = true }
-rustversion = { workspace = true }
-frame-system = { workspace = true }
-frame-executive = { workspace = true }
 # The "std" feature for this pallet is never activated on purpose, in order to test construct_runtime error message
 test-pallet = { workspace = true }
 
diff --git a/substrate/frame/support/test/compile_pass/Cargo.toml b/substrate/frame/support/test/compile_pass/Cargo.toml
index 9e0a7ff7c6756fa39b92d8601198610a940a9f6e..988135d64dbf6ea5405343d22299c25dc3de1024 100644
--- a/substrate/frame/support/test/compile_pass/Cargo.toml
+++ b/substrate/frame/support/test/compile_pass/Cargo.toml
@@ -16,9 +16,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 sp-version = { workspace = true }
diff --git a/substrate/frame/support/test/pallet/Cargo.toml b/substrate/frame/support/test/pallet/Cargo.toml
index f03377dc21eb4166c0575d1dd010275061cc7590..dc5558b1d4b8e45ae421eedfbfcd8fe3af4ceeff 100644
--- a/substrate/frame/support/test/pallet/Cargo.toml
+++ b/substrate/frame/support/test/pallet/Cargo.toml
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { features = ["derive"], workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 
 [features]
diff --git a/substrate/frame/system/Cargo.toml b/substrate/frame/system/Cargo.toml
index 38349c7edbd9499c22db57ef7da07ea3b9b3f23c..1340b2c55c5323d23d0efb848f80e845c737987e 100644
--- a/substrate/frame/system/Cargo.toml
+++ b/substrate/frame/system/Cargo.toml
@@ -18,17 +18,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 cfg-if = { workspace = true }
 codec = { features = ["derive"], workspace = true }
+docify = { workspace = true }
+frame-support = { workspace = true }
 log = { workspace = true }
 scale-info = { features = ["derive", "serde"], workspace = true }
 serde = { features = ["alloc", "derive"], workspace = true }
-frame-support = { workspace = true }
 sp-core = { features = ["serde"], workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
 sp-std = { workspace = true }
 sp-version = { features = ["serde"], workspace = true }
 sp-weights = { features = ["serde"], workspace = true }
-docify = { workspace = true }
 
 [dev-dependencies]
 criterion = { workspace = true, default-features = true }
diff --git a/substrate/frame/system/benchmarking/Cargo.toml b/substrate/frame/system/benchmarking/Cargo.toml
index d9b5e7083bd21a25a24777c53dc6dd406a79c411..e9aac6e519f37c4c45189585327bc53c1fd84c93 100644
--- a/substrate/frame/system/benchmarking/Cargo.toml
+++ b/substrate/frame/system/benchmarking/Cargo.toml
@@ -17,16 +17,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
-sp-io = { workspace = true, default-features = true }
 sp-externalities = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
 
 [features]
diff --git a/substrate/frame/system/rpc/runtime-api/Cargo.toml b/substrate/frame/system/rpc/runtime-api/Cargo.toml
index 8e968a536756d32830d83a8fc6b92db991b5732c..3fd1985619bd4e7640de5bb9e26cf2a9b16fdca8 100644
--- a/substrate/frame/system/rpc/runtime-api/Cargo.toml
+++ b/substrate/frame/system/rpc/runtime-api/Cargo.toml
@@ -17,8 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-sp-api = { workspace = true }
 docify = { workspace = true }
+sp-api = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/timestamp/Cargo.toml b/substrate/frame/timestamp/Cargo.toml
index 0eff0530c7e2444979e09f31f1f242a61c4c57db..75788aef348a34adccfed05dfcf1291c3affefaa 100644
--- a/substrate/frame/timestamp/Cargo.toml
+++ b/substrate/frame/timestamp/Cargo.toml
@@ -18,11 +18,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-inherents = { workspace = true }
 sp-io = { optional = true, workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/tips/Cargo.toml b/substrate/frame/tips/Cargo.toml
index 7c7a2d6aa9098a3bbe79112757e3f53be784b53b..6b5b89e7a19723f4f2e10bdd3bf02db8e27189f8 100644
--- a/substrate/frame/tips/Cargo.toml
+++ b/substrate/frame/tips/Cargo.toml
@@ -17,13 +17,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-treasury = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/frame/transaction-payment/Cargo.toml b/substrate/frame/transaction-payment/Cargo.toml
index afa03ceb12eb8942e540119c5f5a898bd6859566..2639bda18b6c2e8e1a179f96dd8bf876125e69c5 100644
--- a/substrate/frame/transaction-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/Cargo.toml
@@ -19,18 +19,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { optional = true, workspace = true, default-features = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
-serde_json = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml b/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml
index 7c98d157f6ffd5b7e89645aae4d8a8af90c38c49..147859fdb26a4f76d3bbc05cde7b302c069eaf93 100644
--- a/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/asset-conversion-tx-payment/Cargo.toml
@@ -17,21 +17,21 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 # Substrate dependencies
-sp-runtime = { workspace = true }
+codec = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-asset-conversion = { workspace = true }
 pallet-transaction-payment = { workspace = true }
-codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
+sp-runtime = { workspace = true }
 
 [dev-dependencies]
+pallet-assets = { workspace = true, default-features = true }
+pallet-balances = { workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-storage = { workspace = true }
-pallet-assets = { workspace = true, default-features = true }
-pallet-balances = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml b/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
index 89fe5bfe7a42fd32cfd6c46fa485636de7c63c01..2924860c520109bd0a66393e69460ff823f75fa3 100644
--- a/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
+++ b/substrate/frame/transaction-payment/asset-tx-payment/Cargo.toml
@@ -21,10 +21,10 @@ sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
+frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-transaction-payment = { workspace = true }
-frame-benchmarking = { optional = true, workspace = true }
 
 # Other dependencies
 codec = { features = ["derive"], workspace = true }
diff --git a/substrate/frame/transaction-storage/Cargo.toml b/substrate/frame/transaction-storage/Cargo.toml
index f5d6bd1c364c43f2b5fe6bd067b9ddaa239aa833..0ca38e9dd60df3a1ef5b299ea3ee81818b5a304d 100644
--- a/substrate/frame/transaction-storage/Cargo.toml
+++ b/substrate/frame/transaction-storage/Cargo.toml
@@ -18,17 +18,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 array-bytes = { optional = true, workspace = true, default-features = true }
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { optional = true, workspace = true, default-features = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 pallet-balances = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, workspace = true, default-features = true }
 sp-inherents = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-transaction-storage-proof = { workspace = true }
-log = { workspace = true }
 
 [dev-dependencies]
 sp-core = { workspace = true }
diff --git a/substrate/frame/treasury/Cargo.toml b/substrate/frame/treasury/Cargo.toml
index 93a3d9bea93d1b78f01e19206a4b1b9d31e31ba4..c6f059f5fa034818802ad99aa03ce9b7438a1550 100644
--- a/substrate/frame/treasury/Cargo.toml
+++ b/substrate/frame/treasury/Cargo.toml
@@ -21,21 +21,21 @@ codec = { features = [
 	"max-encoded-len",
 ], workspace = true }
 docify = { workspace = true }
-impl-trait-for-tuples = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
+log = { workspace = true }
 pallet-balances = { workspace = true }
-sp-runtime = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
 sp-core = { optional = true, workspace = true }
-log = { workspace = true }
+sp-runtime = { workspace = true }
 
 [dev-dependencies]
-sp-io = { workspace = true, default-features = true }
 pallet-utility = { workspace = true, default-features = true }
 sp-core = { workspace = true }
+sp-io = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/tx-pause/Cargo.toml b/substrate/frame/tx-pause/Cargo.toml
index 03c700ec053cabf37586bdfa57a5e991946fb195..6298645fb2b3f086c38be8db8a60b84868050c61 100644
--- a/substrate/frame/tx-pause/Cargo.toml
+++ b/substrate/frame/tx-pause/Cargo.toml
@@ -20,18 +20,18 @@ docify = { workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-sp-runtime = { workspace = true }
 pallet-balances = { optional = true, workspace = true }
-pallet-utility = { optional = true, workspace = true }
 pallet-proxy = { optional = true, workspace = true }
+pallet-utility = { optional = true, workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+sp-runtime = { workspace = true }
 
 [dev-dependencies]
-sp-core = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
 pallet-balances = { workspace = true, default-features = true }
-pallet-utility = { workspace = true, default-features = true }
 pallet-proxy = { workspace = true, default-features = true }
+pallet-utility = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/frame/uniques/Cargo.toml b/substrate/frame/uniques/Cargo.toml
index abd456d97556beca5497fe501b22d9c54ae0c0eb..135292fb4ecd53e56ad3db4afada1bc41d440c61 100644
--- a/substrate/frame/uniques/Cargo.toml
+++ b/substrate/frame/uniques/Cargo.toml
@@ -17,11 +17,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
diff --git a/substrate/frame/utility/Cargo.toml b/substrate/frame/utility/Cargo.toml
index e2d35fc1699f1b774b7f3c48c34bf2b15572f4ae..c9a4432648eaf94adb6c9482c5bbc9658a34d06c 100644
--- a/substrate/frame/utility/Cargo.toml
+++ b/substrate/frame/utility/Cargo.toml
@@ -17,18 +17,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
-pallet-root-testing = { workspace = true, default-features = true }
 pallet-collective = { workspace = true, default-features = true }
+pallet-root-testing = { workspace = true, default-features = true }
 pallet-timestamp = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 
diff --git a/substrate/frame/verify-signature/Cargo.toml b/substrate/frame/verify-signature/Cargo.toml
index 3c5fd5e651575fdc7fba0ebdced070be25f17589..37cc6c0b30659a31c9913196f429e255e632c698 100644
--- a/substrate/frame/verify-signature/Cargo.toml
+++ b/substrate/frame/verify-signature/Cargo.toml
@@ -17,10 +17,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
@@ -28,8 +28,8 @@ sp-weights = { features = ["serde"], workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, default-features = true }
-pallet-root-testing = { workspace = true, default-features = true }
 pallet-collective = { workspace = true, default-features = true }
+pallet-root-testing = { workspace = true, default-features = true }
 pallet-timestamp = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 
diff --git a/substrate/frame/vesting/Cargo.toml b/substrate/frame/vesting/Cargo.toml
index f896c3962eaacd28c397bbd373d3f7098ef9d4b1..882ce5f813730fb7bc73a171b2b4e071947f7bbd 100644
--- a/substrate/frame/vesting/Cargo.toml
+++ b/substrate/frame/vesting/Cargo.toml
@@ -19,11 +19,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = [
 	"derive",
 ], workspace = true }
-log = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
diff --git a/substrate/frame/whitelist/Cargo.toml b/substrate/frame/whitelist/Cargo.toml
index a347174ed2ebee4fc1cc02e545b4e57c90372e24..68ecc5d0d78e804f43e544f32be746490711dc1f 100644
--- a/substrate/frame/whitelist/Cargo.toml
+++ b/substrate/frame/whitelist/Cargo.toml
@@ -16,10 +16,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-api = { workspace = true }
 sp-runtime = { workspace = true }
 
diff --git a/substrate/primitives/api/Cargo.toml b/substrate/primitives/api/Cargo.toml
index e0a4d06b2d81626ca95834217c3a109580bb7e74..7295adbc11caf681929bc2708f9c9610d9e54691 100644
--- a/substrate/primitives/api/Cargo.toml
+++ b/substrate/primitives/api/Cargo.toml
@@ -17,22 +17,22 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
+docify = { workspace = true }
+hash-db = { optional = true, workspace = true, default-features = true }
+log = { workspace = true }
+scale-info = { features = [
+	"derive",
+], workspace = true }
 sp-api-proc-macro = { workspace = true }
 sp-core = { workspace = true }
+sp-externalities = { optional = true, workspace = true }
+sp-metadata-ir = { optional = true, workspace = true }
 sp-runtime = { workspace = true }
 sp-runtime-interface = { workspace = true }
-sp-externalities = { optional = true, workspace = true }
-sp-version = { workspace = true }
 sp-state-machine = { optional = true, workspace = true }
 sp-trie = { optional = true, workspace = true }
-hash-db = { optional = true, workspace = true, default-features = true }
+sp-version = { workspace = true }
 thiserror = { optional = true, workspace = true }
-scale-info = { features = [
-	"derive",
-], workspace = true }
-sp-metadata-ir = { optional = true, workspace = true }
-log = { workspace = true }
-docify = { workspace = true }
 
 [dev-dependencies]
 sp-test-primitives = { workspace = true }
diff --git a/substrate/primitives/api/proc-macro/Cargo.toml b/substrate/primitives/api/proc-macro/Cargo.toml
index 191578f432adb84f2570669dbfa26ae68dda5dbf..2f414597fb74461106db50c6a4351a8c44dea8f5 100644
--- a/substrate/primitives/api/proc-macro/Cargo.toml
+++ b/substrate/primitives/api/proc-macro/Cargo.toml
@@ -19,13 +19,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-quote = { workspace = true }
-syn = { features = ["extra-traits", "fold", "full", "visit", "visit-mut"], workspace = true }
-proc-macro2 = { workspace = true }
+Inflector = { workspace = true }
 blake2 = { workspace = true }
-proc-macro-crate = { workspace = true }
 expander = { workspace = true }
-Inflector = { workspace = true }
+proc-macro-crate = { workspace = true }
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
+syn = { features = ["extra-traits", "fold", "full", "visit", "visit-mut"], workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
diff --git a/substrate/primitives/api/test/Cargo.toml b/substrate/primitives/api/test/Cargo.toml
index 27f6dafa24bf8fa73af2677c7157ddfa9160bf43..9b02cf125eae4192e3fa8ca4ff459e24a667cc97 100644
--- a/substrate/primitives/api/test/Cargo.toml
+++ b/substrate/primitives/api/test/Cargo.toml
@@ -15,19 +15,19 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+codec = { workspace = true, default-features = true }
+rustversion = { workspace = true }
+sc-block-builder = { workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-api = { workspace = true, default-features = true }
-substrate-test-runtime-client = { workspace = true }
-sp-version = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-metadata-ir = { workspace = true, default-features = true }
-sc-block-builder = { workspace = true, default-features = true }
-codec = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
+sp-version = { workspace = true, default-features = true }
+substrate-test-runtime-client = { workspace = true }
 trybuild = { workspace = true }
-rustversion = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 
 [dev-dependencies]
 criterion = { workspace = true, default-features = true }
diff --git a/substrate/primitives/application-crypto/Cargo.toml b/substrate/primitives/application-crypto/Cargo.toml
index 1161d43ded5a87ad0f6a647a940b4972b4156d5d..9589cce042f55fb07cbe6ef5bbffd82734d87524 100644
--- a/substrate/primitives/application-crypto/Cargo.toml
+++ b/substrate/primitives/application-crypto/Cargo.toml
@@ -18,10 +18,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 
 [dependencies]
-sp-core = { workspace = true }
 codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { optional = true, features = ["alloc", "derive"], workspace = true }
+sp-core = { workspace = true }
 sp-io = { workspace = true }
 
 [features]
diff --git a/substrate/primitives/arithmetic/Cargo.toml b/substrate/primitives/arithmetic/Cargo.toml
index 485656bf30bb40fc5a3c946c05d530e2a44c19d4..77b82fbe64686b4e043d5d5b2066a76d8d637e68 100644
--- a/substrate/primitives/arithmetic/Cargo.toml
+++ b/substrate/primitives/arithmetic/Cargo.toml
@@ -21,18 +21,18 @@ codec = { features = [
 	"derive",
 	"max-encoded-len",
 ], workspace = true }
+docify = { workspace = true }
 integer-sqrt = { workspace = true }
 num-traits = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { features = ["alloc", "derive"], optional = true, workspace = true }
 static_assertions = { workspace = true, default-features = true }
-docify = { workspace = true }
 
 [dev-dependencies]
 criterion = { workspace = true, default-features = true }
 primitive-types = { workspace = true, default-features = true }
-sp-crypto-hashing = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
+sp-crypto-hashing = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/blockchain/Cargo.toml b/substrate/primitives/blockchain/Cargo.toml
index 93158274d98f95af1c73aed1a2e9d90670a49094..aed09a684bdae678effd3bc583d9a747a03f32c5 100644
--- a/substrate/primitives/blockchain/Cargo.toml
+++ b/substrate/primitives/blockchain/Cargo.toml
@@ -21,11 +21,11 @@ codec = { features = ["derive"], workspace = true }
 futures = { workspace = true }
 parking_lot = { workspace = true, default-features = true }
 schnellru = { workspace = true }
-thiserror = { workspace = true }
 sp-api = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-database = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 tracing = { workspace = true, default-features = true }
diff --git a/substrate/primitives/consensus/beefy/Cargo.toml b/substrate/primitives/consensus/beefy/Cargo.toml
index 13d80683c853da5db00efe896161158a2a06041a..572e46d8de8d85cffcb8880ce82c2666f00af5db 100644
--- a/substrate/primitives/consensus/beefy/Cargo.toml
+++ b/substrate/primitives/consensus/beefy/Cargo.toml
@@ -23,9 +23,9 @@ sp-application-crypto = { workspace = true }
 sp-core = { workspace = true }
 sp-crypto-hashing = { workspace = true }
 sp-io = { workspace = true }
+sp-keystore = { workspace = true }
 sp-mmr-primitives = { workspace = true }
 sp-runtime = { workspace = true }
-sp-keystore = { workspace = true }
 sp-weights = { workspace = true }
 strum = { features = ["derive"], workspace = true }
 
diff --git a/substrate/primitives/consensus/common/Cargo.toml b/substrate/primitives/consensus/common/Cargo.toml
index 764ef1d973460b499cc90eee19183747a11f37e3..3a6ffd031ec51d806c7188c32c90ee93800dba0c 100644
--- a/substrate/primitives/consensus/common/Cargo.toml
+++ b/substrate/primitives/consensus/common/Cargo.toml
@@ -20,11 +20,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 async-trait = { workspace = true }
 futures = { features = ["thread-pool"], workspace = true }
 log = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 sp-core = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 futures = { workspace = true }
diff --git a/substrate/primitives/core/Cargo.toml b/substrate/primitives/core/Cargo.toml
index f6bc17bccacaf48354ad43dcd327c2577a35ad66..0ea885abd22d75e158eefd393f167c35971c333d 100644
--- a/substrate/primitives/core/Cargo.toml
+++ b/substrate/primitives/core/Cargo.toml
@@ -16,47 +16,47 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { features = ["derive", "max-encoded-len"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
-log = { workspace = true }
-serde = { optional = true, features = ["alloc", "derive"], workspace = true }
 bounded-collections = { workspace = true }
-primitive-types = { features = ["codec", "scale-info"], workspace = true }
-impl-serde = { optional = true, workspace = true }
+bs58 = { optional = true, workspace = true }
+codec = { features = ["derive", "max-encoded-len"], workspace = true }
 hash-db = { workspace = true }
 hash256-std-hasher = { workspace = true }
-bs58 = { optional = true, workspace = true }
+impl-serde = { optional = true, workspace = true }
+log = { workspace = true }
+primitive-types = { features = ["codec", "scale-info"], workspace = true }
 rand = { features = [
 	"small_rng",
 ], optional = true, workspace = true, default-features = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { optional = true, features = ["alloc", "derive"], workspace = true }
 substrate-bip39 = { workspace = true }
 # personal fork here as workaround for: https://github.com/rust-bitcoin/rust-bip39/pull/64
 bip39 = { package = "parity-bip39", version = "2.0.1", default-features = false, features = [
 	"alloc",
 ] }
-zeroize = { workspace = true }
-secrecy = { features = ["alloc"], workspace = true }
+bitflags = { workspace = true }
+dyn-clonable = { optional = true, workspace = true }
+futures = { optional = true, workspace = true }
+itertools = { optional = true, workspace = true }
 parking_lot = { optional = true, workspace = true, default-features = true }
-ss58-registry = { workspace = true }
-sp-std = { workspace = true }
+paste = { workspace = true, default-features = true }
+secrecy = { features = ["alloc"], workspace = true }
 sp-debug-derive = { workspace = true }
-sp-storage = { workspace = true }
 sp-externalities = { optional = true, workspace = true }
-futures = { optional = true, workspace = true }
-dyn-clonable = { optional = true, workspace = true }
+sp-std = { workspace = true }
+sp-storage = { workspace = true }
+ss58-registry = { workspace = true }
 thiserror = { optional = true, workspace = true }
 tracing = { optional = true, workspace = true, default-features = true }
-bitflags = { workspace = true }
-paste = { workspace = true, default-features = true }
-itertools = { optional = true, workspace = true }
+zeroize = { workspace = true }
 
 # full crypto
 array-bytes = { workspace = true, default-features = true }
-ed25519-zebra = { workspace = true }
 blake2 = { optional = true, workspace = true }
+ed25519-zebra = { workspace = true }
 libsecp256k1 = { features = ["static-context"], workspace = true }
-schnorrkel = { features = ["preaudit_deprecated"], workspace = true }
 merlin = { workspace = true }
+schnorrkel = { features = ["preaudit_deprecated"], workspace = true }
 sp-crypto-hashing = { workspace = true }
 sp-runtime-interface = { workspace = true }
 # k256 crate, better portability, intended to be used in substrate-runtimes (no-std)
@@ -76,8 +76,8 @@ bandersnatch_vrfs = { git = "https://github.com/w3f/ring-vrf", rev = "0fef826",
 
 [dev-dependencies]
 criterion = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
 regex = { workspace = true }
+serde_json = { workspace = true, default-features = true }
 
 [[bench]]
 name = "bench"
diff --git a/substrate/primitives/crypto/ec-utils/Cargo.toml b/substrate/primitives/crypto/ec-utils/Cargo.toml
index 29e30133ebead7a32180aadaacc76fe5d6972323..1e5964f855758a818aa099bad2436b1af6709fb7 100644
--- a/substrate/primitives/crypto/ec-utils/Cargo.toml
+++ b/substrate/primitives/crypto/ec-utils/Cargo.toml
@@ -15,17 +15,17 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-ark-ec = { optional = true, workspace = true }
-ark-bls12-377-ext = { optional = true, workspace = true }
 ark-bls12-377 = { features = ["curve"], optional = true, workspace = true }
-ark-bls12-381-ext = { optional = true, workspace = true }
+ark-bls12-377-ext = { optional = true, workspace = true }
 ark-bls12-381 = { features = ["curve"], optional = true, workspace = true }
-ark-bw6-761-ext = { optional = true, workspace = true }
+ark-bls12-381-ext = { optional = true, workspace = true }
 ark-bw6-761 = { optional = true, workspace = true }
-ark-ed-on-bls12-381-bandersnatch-ext = { optional = true, workspace = true }
-ark-ed-on-bls12-381-bandersnatch = { optional = true, workspace = true }
-ark-ed-on-bls12-377-ext = { optional = true, workspace = true }
+ark-bw6-761-ext = { optional = true, workspace = true }
+ark-ec = { optional = true, workspace = true }
 ark-ed-on-bls12-377 = { optional = true, workspace = true }
+ark-ed-on-bls12-377-ext = { optional = true, workspace = true }
+ark-ed-on-bls12-381-bandersnatch = { optional = true, workspace = true }
+ark-ed-on-bls12-381-bandersnatch-ext = { optional = true, workspace = true }
 ark-scale = { features = ["hazmat"], optional = true, workspace = true }
 sp-runtime-interface = { optional = true, workspace = true }
 
diff --git a/substrate/primitives/crypto/hashing/proc-macro/Cargo.toml b/substrate/primitives/crypto/hashing/proc-macro/Cargo.toml
index 6f974a3e2c8ab9edebb41bcd1c6278291c596766..e09661d41c1111d7b85cb818e1650b245cadbe9d 100644
--- a/substrate/primitives/crypto/hashing/proc-macro/Cargo.toml
+++ b/substrate/primitives/crypto/hashing/proc-macro/Cargo.toml
@@ -20,5 +20,5 @@ proc-macro = true
 
 [dependencies]
 quote = { workspace = true }
-syn = { features = ["full", "parsing"], workspace = true }
 sp-crypto-hashing = { workspace = true }
+syn = { features = ["full", "parsing"], workspace = true }
diff --git a/substrate/primitives/debug-derive/Cargo.toml b/substrate/primitives/debug-derive/Cargo.toml
index 4979b89155ab3e87e5fc9804f0a89ac0dab93d16..a26cbbf62adac467ed8e3a16b8c55fcff43ea0d8 100644
--- a/substrate/primitives/debug-derive/Cargo.toml
+++ b/substrate/primitives/debug-derive/Cargo.toml
@@ -19,9 +19,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
+proc-macro2 = { workspace = true }
 quote = { workspace = true }
 syn = { workspace = true }
-proc-macro2 = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/genesis-builder/Cargo.toml b/substrate/primitives/genesis-builder/Cargo.toml
index 285b214907ad5a892f5cc33bf38c4539a070fe41..f1fa60d023be4ed527fa81b3b6d24768cac21e6b 100644
--- a/substrate/primitives/genesis-builder/Cargo.toml
+++ b/substrate/primitives/genesis-builder/Cargo.toml
@@ -19,9 +19,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { features = ["bytes"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 
+serde_json = { features = ["alloc", "arbitrary_precision"], workspace = true }
 sp-api = { workspace = true }
 sp-runtime = { workspace = true }
-serde_json = { features = ["alloc", "arbitrary_precision"], workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/inherents/Cargo.toml b/substrate/primitives/inherents/Cargo.toml
index 271308c9cbf1cc60ba7cd44ab1873cbd61c8a424..19966919047f9b2fbcb0db25c000fb416566252d 100644
--- a/substrate/primitives/inherents/Cargo.toml
+++ b/substrate/primitives/inherents/Cargo.toml
@@ -19,10 +19,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 async-trait = { optional = true, workspace = true }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 impl-trait-for-tuples = { workspace = true }
-thiserror = { optional = true, workspace = true }
+scale-info = { features = ["derive"], workspace = true }
 sp-runtime = { optional = true, workspace = true }
+thiserror = { optional = true, workspace = true }
 
 [dev-dependencies]
 futures = { workspace = true }
diff --git a/substrate/primitives/io/Cargo.toml b/substrate/primitives/io/Cargo.toml
index 97940759a98701f637452ab9590ab6a511df19a2..b0c99002910b01868cf7eef69d292bebf28b98fa 100644
--- a/substrate/primitives/io/Cargo.toml
+++ b/substrate/primitives/io/Cargo.toml
@@ -22,20 +22,20 @@ bytes = { workspace = true }
 codec = { features = [
 	"bytes",
 ], workspace = true }
-sp-core = { workspace = true }
-sp-crypto-hashing = { workspace = true }
-sp-keystore = { optional = true, workspace = true }
 libsecp256k1 = { optional = true, workspace = true, default-features = true }
-sp-state-machine = { optional = true, workspace = true }
-sp-runtime-interface = { workspace = true }
-sp-trie = { optional = true, workspace = true }
-sp-externalities = { workspace = true }
-sp-tracing = { workspace = true }
 log = { optional = true, workspace = true, default-features = true }
 secp256k1 = { features = [
 	"global-context",
 	"recovery",
 ], optional = true, workspace = true, default-features = true }
+sp-core = { workspace = true }
+sp-crypto-hashing = { workspace = true }
+sp-externalities = { workspace = true }
+sp-keystore = { optional = true, workspace = true }
+sp-runtime-interface = { workspace = true }
+sp-state-machine = { optional = true, workspace = true }
+sp-tracing = { workspace = true }
+sp-trie = { optional = true, workspace = true }
 tracing = { workspace = true }
 tracing-core = { workspace = true }
 
diff --git a/substrate/primitives/keyring/Cargo.toml b/substrate/primitives/keyring/Cargo.toml
index 27f7304a935811a3623f5f2303c4304044561458..9ffcf50c7b455f7dce392238c941ff4c50866c60 100644
--- a/substrate/primitives/keyring/Cargo.toml
+++ b/substrate/primitives/keyring/Cargo.toml
@@ -17,9 +17,9 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-strum = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
+strum = { features = ["derive"], workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/merkle-mountain-range/Cargo.toml b/substrate/primitives/merkle-mountain-range/Cargo.toml
index 6f944a3f6a8da13d218731eff817cef9021c59f1..5f861ca7acf1ce985aedb6199559f6608e00b8ab 100644
--- a/substrate/primitives/merkle-mountain-range/Cargo.toml
+++ b/substrate/primitives/merkle-mountain-range/Cargo.toml
@@ -16,9 +16,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 log = { workspace = true }
 mmr-lib = { package = "polkadot-ckb-merkle-mountain-range", version = "0.7.0", default-features = false }
+scale-info = { features = ["derive"], workspace = true }
 serde = { features = ["alloc", "derive"], optional = true, workspace = true }
 sp-api = { workspace = true }
 sp-core = { workspace = true }
diff --git a/substrate/primitives/runtime-interface/Cargo.toml b/substrate/primitives/runtime-interface/Cargo.toml
index ee44d90fa959d56e4242e22c7c0cf5f0b1c6067a..2d82838ca0b3b5d75e06a0161906f84f3cc53682 100644
--- a/substrate/primitives/runtime-interface/Cargo.toml
+++ b/substrate/primitives/runtime-interface/Cargo.toml
@@ -18,26 +18,26 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 bytes = { workspace = true }
-sp-wasm-interface = { workspace = true }
-sp-std = { workspace = true }
-sp-tracing = { workspace = true }
-sp-runtime-interface-proc-macro = { workspace = true, default-features = true }
-sp-externalities = { workspace = true }
 codec = { features = ["bytes"], workspace = true }
-static_assertions = { workspace = true, default-features = true }
+impl-trait-for-tuples = { workspace = true }
 primitive-types = { workspace = true }
+sp-externalities = { workspace = true }
+sp-runtime-interface-proc-macro = { workspace = true, default-features = true }
+sp-std = { workspace = true }
 sp-storage = { workspace = true }
-impl-trait-for-tuples = { workspace = true }
+sp-tracing = { workspace = true }
+sp-wasm-interface = { workspace = true }
+static_assertions = { workspace = true, default-features = true }
 
 [target.'cfg(all(any(target_arch = "riscv32", target_arch = "riscv64"), substrate_runtime))'.dependencies]
 polkavm-derive = { workspace = true }
 
 [dev-dependencies]
-sp-runtime-interface-test-wasm = { workspace = true }
-sp-state-machine = { workspace = true, default-features = true }
+rustversion = { workspace = true }
 sp-core = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
-rustversion = { workspace = true }
+sp-runtime-interface-test-wasm = { workspace = true }
+sp-state-machine = { workspace = true, default-features = true }
 trybuild = { workspace = true }
 
 [features]
diff --git a/substrate/primitives/runtime-interface/proc-macro/Cargo.toml b/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
index 3fd5f073f0254336ae2c7ee12c2e1010a766f3a5..2112d5bc06933e599b02712f16d778518c236940 100644
--- a/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
+++ b/substrate/primitives/runtime-interface/proc-macro/Cargo.toml
@@ -20,8 +20,8 @@ proc-macro = true
 
 [dependencies]
 Inflector = { workspace = true }
+expander = { workspace = true }
 proc-macro-crate = { workspace = true }
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
-expander = { workspace = true }
 syn = { features = ["extra-traits", "fold", "full", "visit"], workspace = true }
diff --git a/substrate/primitives/runtime-interface/test/Cargo.toml b/substrate/primitives/runtime-interface/test/Cargo.toml
index 29ef0f6b4892d4576a62652e0bd9d47a25d0e1ba..ebcf4222bda39aa983c49271ebefe2e1e24ff2b2 100644
--- a/substrate/primitives/runtime-interface/test/Cargo.toml
+++ b/substrate/primitives/runtime-interface/test/Cargo.toml
@@ -15,8 +15,6 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-tracing = { workspace = true, default-features = true }
-tracing-core = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
 sc-executor-common = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
@@ -25,3 +23,5 @@ sp-runtime-interface = { workspace = true, default-features = true }
 sp-runtime-interface-test-wasm = { workspace = true }
 sp-runtime-interface-test-wasm-deprecated = { workspace = true }
 sp-state-machine = { workspace = true, default-features = true }
+tracing = { workspace = true, default-features = true }
+tracing-core = { workspace = true, default-features = true }
diff --git a/substrate/primitives/runtime/Cargo.toml b/substrate/primitives/runtime/Cargo.toml
index 8a812c3a5772a4929048ec590440cd0ec27a06db..89c221d574fca3591a03be9d31568d83fbd43a71 100644
--- a/substrate/primitives/runtime/Cargo.toml
+++ b/substrate/primitives/runtime/Cargo.toml
@@ -17,7 +17,9 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+binary-merkle-tree = { workspace = true }
 codec = { features = ["derive", "max-encoded-len"], workspace = true }
+docify = { workspace = true }
 either = { workspace = true }
 hash256-std-hasher = { workspace = true }
 impl-trait-for-tuples = { workspace = true }
@@ -34,9 +36,7 @@ sp-io = { workspace = true }
 sp-std = { workspace = true }
 sp-trie = { workspace = true }
 sp-weights = { workspace = true }
-docify = { workspace = true }
 tracing = { workspace = true, features = ["log"], default-features = false }
-binary-merkle-tree = { workspace = true }
 
 simple-mermaid = { version = "0.1.1", optional = true }
 tuplex = { version = "0.1.2", default-features = false }
@@ -44,11 +44,11 @@ tuplex = { version = "0.1.2", default-features = false }
 [dev-dependencies]
 rand = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
-zstd = { workspace = true }
 sp-api = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
+zstd = { workspace = true }
 
 [features]
 runtime-benchmarks = []
diff --git a/substrate/primitives/session/Cargo.toml b/substrate/primitives/session/Cargo.toml
index 6abf83505530503f46e0c6ff3dd3db0b55fce953..72be81c1222ef6c764b34f29bc698973ad854d05 100644
--- a/substrate/primitives/session/Cargo.toml
+++ b/substrate/primitives/session/Cargo.toml
@@ -20,9 +20,9 @@ codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 sp-api = { workspace = true }
 sp-core = { workspace = true }
+sp-keystore = { optional = true, workspace = true }
 sp-runtime = { optional = true, workspace = true }
 sp-staking = { workspace = true }
-sp-keystore = { optional = true, workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/staking/Cargo.toml b/substrate/primitives/staking/Cargo.toml
index 35e7e4f604136df10e65673681b4b1abe95625de..42694cdbb67433241e970626185edac87ecc9a3d 100644
--- a/substrate/primitives/staking/Cargo.toml
+++ b/substrate/primitives/staking/Cargo.toml
@@ -16,10 +16,10 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-serde = { features = ["alloc", "derive"], optional = true, workspace = true }
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 impl-trait-for-tuples = { workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+serde = { features = ["alloc", "derive"], optional = true, workspace = true }
 
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
diff --git a/substrate/primitives/state-machine/Cargo.toml b/substrate/primitives/state-machine/Cargo.toml
index e1c67feb7ac59aa45f3893da9c928656c9759ab8..5bc06b8cb509a3b21823f3aff557e39101340954 100644
--- a/substrate/primitives/state-machine/Cargo.toml
+++ b/substrate/primitives/state-machine/Cargo.toml
@@ -17,28 +17,28 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+arbitrary = { features = ["derive"], optional = true, workspace = true }
 codec = { workspace = true }
 hash-db = { workspace = true }
 log = { workspace = true }
 parking_lot = { optional = true, workspace = true, default-features = true }
 rand = { optional = true, workspace = true, default-features = true }
 smallvec = { workspace = true, default-features = true }
-thiserror = { optional = true, workspace = true }
-tracing = { optional = true, workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-externalities = { workspace = true }
 sp-panic-handler = { optional = true, workspace = true, default-features = true }
 sp-trie = { workspace = true }
+thiserror = { optional = true, workspace = true }
+tracing = { optional = true, workspace = true, default-features = true }
 trie-db = { workspace = true }
-arbitrary = { features = ["derive"], optional = true, workspace = true }
 
 [dev-dependencies]
+arbitrary = { features = ["derive"], workspace = true }
 array-bytes = { workspace = true, default-features = true }
+assert_matches = { workspace = true }
 pretty_assertions = { workspace = true }
 rand = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-assert_matches = { workspace = true }
-arbitrary = { features = ["derive"], workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/state-machine/fuzz/Cargo.toml b/substrate/primitives/state-machine/fuzz/Cargo.toml
index 416c00c34fda4e8e1853f2b8d414e40f7d1ff808..16bf5b92025f0d357588fc7704b23544d27e2fd5 100644
--- a/substrate/primitives/state-machine/fuzz/Cargo.toml
+++ b/substrate/primitives/state-machine/fuzz/Cargo.toml
@@ -13,8 +13,8 @@ libfuzzer-sys = "0.4"
 sp-runtime = { path = "../../runtime" }
 
 [dependencies.sp-state-machine]
-path = ".."
 features = ["fuzzing"]
+path = ".."
 
 # Prevent this from interfering with workspaces
 [workspace]
diff --git a/substrate/primitives/statement-store/Cargo.toml b/substrate/primitives/statement-store/Cargo.toml
index aac676caedc9aef96ab994d64a09928d7f61eff6..df66cfcfc2e655f95566af0880930e39f47633d2 100644
--- a/substrate/primitives/statement-store/Cargo.toml
+++ b/substrate/primitives/statement-store/Cargo.toml
@@ -18,23 +18,23 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
+sp-api = { workspace = true }
+sp-application-crypto = { workspace = true }
 sp-core = { workspace = true }
 sp-crypto-hashing = { workspace = true }
+sp-externalities = { workspace = true }
 sp-runtime = { workspace = true }
-sp-api = { workspace = true }
-sp-application-crypto = { workspace = true }
 sp-runtime-interface = { workspace = true }
-sp-externalities = { workspace = true }
 thiserror = { optional = true, workspace = true }
 
 # ECIES dependencies
-ed25519-dalek = { optional = true, workspace = true, default-features = true }
-x25519-dalek = { optional = true, features = ["static_secrets"], workspace = true }
-curve25519-dalek = { optional = true, workspace = true }
 aes-gcm = { optional = true, workspace = true }
+curve25519-dalek = { optional = true, workspace = true }
+ed25519-dalek = { optional = true, workspace = true, default-features = true }
 hkdf = { optional = true, workspace = true }
-sha2 = { optional = true, workspace = true, default-features = true }
 rand = { features = ["small_rng"], optional = true, workspace = true, default-features = true }
+sha2 = { optional = true, workspace = true, default-features = true }
+x25519-dalek = { optional = true, features = ["static_secrets"], workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/timestamp/Cargo.toml b/substrate/primitives/timestamp/Cargo.toml
index 0fcd5be98e6f6782f1c1f8d01c1a9d574bdc7f39..619f1eaa142b8974815b5353c88ee77e42f88b94 100644
--- a/substrate/primitives/timestamp/Cargo.toml
+++ b/substrate/primitives/timestamp/Cargo.toml
@@ -18,9 +18,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 async-trait = { optional = true, workspace = true }
 codec = { features = ["derive"], workspace = true }
-thiserror = { optional = true, workspace = true }
 sp-inherents = { workspace = true }
 sp-runtime = { workspace = true }
+thiserror = { optional = true, workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/trie/Cargo.toml b/substrate/primitives/trie/Cargo.toml
index 7f27bb097290e06cee472a3ddfbfff5eb0783c09..65a9727ed2ae8717ed6de3387a35f10db777e521 100644
--- a/substrate/primitives/trie/Cargo.toml
+++ b/substrate/primitives/trie/Cargo.toml
@@ -29,20 +29,20 @@ nohash-hasher = { optional = true, workspace = true }
 parking_lot = { optional = true, workspace = true, default-features = true }
 rand = { optional = true, workspace = true, default-features = true }
 scale-info = { features = ["derive"], workspace = true }
+schnellru = { optional = true, workspace = true }
+sp-core = { workspace = true }
+sp-externalities = { workspace = true }
 thiserror = { optional = true, workspace = true }
 tracing = { optional = true, workspace = true, default-features = true }
 trie-db = { workspace = true }
 trie-root = { workspace = true }
-sp-core = { workspace = true }
-sp-externalities = { workspace = true }
-schnellru = { optional = true, workspace = true }
 
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
 criterion = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
 trie-bench = { workspace = true }
 trie-standardmap = { workspace = true }
-sp-runtime = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/version/Cargo.toml b/substrate/primitives/version/Cargo.toml
index 0424304989b7d808bda4213e1c83f3d520cfc06b..7fa983d0282384fa418f5145c053f05703fa1b4f 100644
--- a/substrate/primitives/version/Cargo.toml
+++ b/substrate/primitives/version/Cargo.toml
@@ -22,11 +22,11 @@ impl-serde = { optional = true, workspace = true }
 parity-wasm = { optional = true, workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 serde = { features = ["alloc", "derive"], optional = true, workspace = true }
-thiserror = { optional = true, workspace = true }
 sp-crypto-hashing-proc-macro = { workspace = true, default-features = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 sp-version-proc-macro = { workspace = true }
+thiserror = { optional = true, workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/wasm-interface/Cargo.toml b/substrate/primitives/wasm-interface/Cargo.toml
index 9d0310fd22e8ea675ade50110d002afa8f3adeb2..9f8eea5102d63a91ad6bbd091347920f319763f6 100644
--- a/substrate/primitives/wasm-interface/Cargo.toml
+++ b/substrate/primitives/wasm-interface/Cargo.toml
@@ -17,11 +17,11 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+anyhow = { optional = true, workspace = true }
 codec = { features = ["derive"], workspace = true }
 impl-trait-for-tuples = { workspace = true }
 log = { optional = true, workspace = true, default-features = true }
 wasmtime = { optional = true, workspace = true }
-anyhow = { optional = true, workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/primitives/weights/Cargo.toml b/substrate/primitives/weights/Cargo.toml
index c4e1897dbb8ec02d8d37f9964cf2de11ee6bbf28..9cd0d9ac2e2064b73533db625f65aa6bfd3f025a 100644
--- a/substrate/primitives/weights/Cargo.toml
+++ b/substrate/primitives/weights/Cargo.toml
@@ -19,11 +19,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 bounded-collections = { workspace = true }
 codec = { features = ["derive"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
+schemars = { optional = true, workspace = true }
 serde = { optional = true, features = ["alloc", "derive"], workspace = true }
 smallvec = { workspace = true, default-features = true }
 sp-arithmetic = { workspace = true }
 sp-debug-derive = { workspace = true }
-schemars = { optional = true, workspace = true }
 
 [features]
 default = ["std"]
diff --git a/substrate/scripts/ci/node-template-release/Cargo.toml b/substrate/scripts/ci/node-template-release/Cargo.toml
index d335dbcf39713d3afd2d8d32ab3115f1b5815aae..5b90044d44dd14dd22a5e3607fa5f4c0622779b9 100644
--- a/substrate/scripts/ci/node-template-release/Cargo.toml
+++ b/substrate/scripts/ci/node-template-release/Cargo.toml
@@ -18,7 +18,7 @@ clap = { features = ["derive"], workspace = true }
 flate2 = { workspace = true }
 fs_extra = { workspace = true }
 glob = { workspace = true }
+itertools = { workspace = true }
 tar = { workspace = true }
 tempfile = { workspace = true }
 toml_edit = { workspace = true }
-itertools = { workspace = true }
diff --git a/substrate/test-utils/Cargo.toml b/substrate/test-utils/Cargo.toml
index 4f7a7090685983a8823883aa25411c30e812dd56..87c9cb731e3a46ac1149bd45bc4d59b14ef20a91 100644
--- a/substrate/test-utils/Cargo.toml
+++ b/substrate/test-utils/Cargo.toml
@@ -20,5 +20,5 @@ futures = { workspace = true }
 tokio = { features = ["macros", "time"], workspace = true, default-features = true }
 
 [dev-dependencies]
-trybuild = { features = ["diff"], workspace = true }
 sc-service = { workspace = true, default-features = true }
+trybuild = { features = ["diff"], workspace = true }
diff --git a/substrate/test-utils/cli/Cargo.toml b/substrate/test-utils/cli/Cargo.toml
index 3fbcf2090683cbc4243cd683cb777270b191d6c9..b11e67bc49bcab221af4ab7394c040017d28fe32 100644
--- a/substrate/test-utils/cli/Cargo.toml
+++ b/substrate/test-utils/cli/Cargo.toml
@@ -16,17 +16,17 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-substrate-rpc-client = { workspace = true, default-features = true }
-sp-rpc = { workspace = true, default-features = true }
 assert_cmd = { workspace = true }
+futures = { workspace = true }
 nix = { features = ["signal"], workspace = true }
-regex = { workspace = true }
-tokio = { features = ["full"], workspace = true, default-features = true }
-node-primitives = { workspace = true, default-features = true }
 node-cli = { workspace = true }
+node-primitives = { workspace = true, default-features = true }
+regex = { workspace = true }
 sc-cli = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
-futures = { workspace = true }
+sp-rpc = { workspace = true, default-features = true }
+substrate-rpc-client = { workspace = true, default-features = true }
+tokio = { features = ["full"], workspace = true, default-features = true }
 
 [features]
 try-runtime = ["node-cli/try-runtime"]
diff --git a/substrate/test-utils/client/Cargo.toml b/substrate/test-utils/client/Cargo.toml
index a67c91fc5f794f275b4418ce228b95427ec351ec..e7ab4c8c8367d6ec9376b5849093d0a187c0020c 100644
--- a/substrate/test-utils/client/Cargo.toml
+++ b/substrate/test-utils/client/Cargo.toml
@@ -20,8 +20,6 @@ array-bytes = { workspace = true, default-features = true }
 async-trait = { workspace = true }
 codec = { workspace = true, default-features = true }
 futures = { workspace = true }
-serde = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
 sc-client-api = { workspace = true, default-features = true }
 sc-client-db = { features = [
 	"test-helpers",
@@ -30,6 +28,8 @@ sc-consensus = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
 sc-offchain = { workspace = true, default-features = true }
 sc-service = { workspace = true }
+serde = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
diff --git a/substrate/test-utils/runtime/Cargo.toml b/substrate/test-utils/runtime/Cargo.toml
index 96a88805287690468bab5c795af0bb80c39fe208..7af692b437f639e023880117f3a47e8eaeea107c 100644
--- a/substrate/test-utils/runtime/Cargo.toml
+++ b/substrate/test-utils/runtime/Cargo.toml
@@ -16,43 +16,43 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+codec = { features = ["derive"], workspace = true }
+frame-executive = { workspace = true }
+frame-metadata-hash-extension = { workspace = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+frame-system-rpc-runtime-api = { workspace = true }
+pallet-babe = { workspace = true }
+pallet-balances = { workspace = true }
+pallet-timestamp = { workspace = true }
+sc-service = { optional = true, workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+sp-api = { workspace = true }
 sp-application-crypto = { features = ["serde"], workspace = true }
+sp-block-builder = { workspace = true }
 sp-consensus-aura = { features = ["serde"], workspace = true }
 sp-consensus-babe = { features = ["serde"], workspace = true }
+sp-consensus-grandpa = { features = ["serde"], workspace = true }
+sp-core = { features = ["serde"], workspace = true }
+sp-crypto-hashing = { workspace = true }
+sp-externalities = { workspace = true }
 sp-genesis-builder = { workspace = true }
-sp-block-builder = { workspace = true }
-codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 sp-inherents = { workspace = true }
+sp-io = { workspace = true }
 sp-keyring = { workspace = true }
 sp-offchain = { workspace = true }
-sp-core = { features = ["serde"], workspace = true }
-sp-crypto-hashing = { workspace = true }
-sp-io = { workspace = true }
-frame-support = { workspace = true }
-sp-version = { workspace = true }
-sp-session = { workspace = true }
-sp-api = { workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
-pallet-babe = { workspace = true }
-pallet-balances = { workspace = true }
-frame-executive = { workspace = true }
-frame-metadata-hash-extension = { workspace = true }
-frame-system = { workspace = true }
-frame-system-rpc-runtime-api = { workspace = true }
-pallet-timestamp = { workspace = true }
-sp-consensus-grandpa = { features = ["serde"], workspace = true }
-sp-trie = { workspace = true }
+sp-session = { workspace = true }
+sp-state-machine = { workspace = true }
 sp-transaction-pool = { workspace = true }
+sp-trie = { workspace = true }
+sp-version = { workspace = true }
 trie-db = { workspace = true }
-sc-service = { optional = true, workspace = true }
-sp-state-machine = { workspace = true }
-sp-externalities = { workspace = true }
 
 # 3rd party
 array-bytes = { optional = true, workspace = true, default-features = true }
-serde_json = { workspace = true, features = ["alloc"] }
 log = { workspace = true }
+serde_json = { workspace = true, features = ["alloc"] }
 tracing = { workspace = true, default-features = false }
 
 [dev-dependencies]
@@ -61,11 +61,11 @@ sc-block-builder = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
 sc-executor-common = { workspace = true, default-features = true }
-sp-consensus = { workspace = true, default-features = true }
-substrate-test-runtime-client = { workspace = true }
-sp-tracing = { workspace = true, default-features = true }
 serde = { features = ["alloc", "derive"], workspace = true }
 serde_json = { features = ["alloc"], workspace = true }
+sp-consensus = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
+substrate-test-runtime-client = { workspace = true }
 
 [build-dependencies]
 substrate-wasm-builder = { optional = true, features = ["metadata-hash"], workspace = true, default-features = true }
diff --git a/substrate/test-utils/runtime/transaction-pool/Cargo.toml b/substrate/test-utils/runtime/transaction-pool/Cargo.toml
index 3cdaea642263e67f3f2594d2d14e2e5dbcad375f..501c9f99ebf11b2244554ea6346257c58b6cbe4b 100644
--- a/substrate/test-utils/runtime/transaction-pool/Cargo.toml
+++ b/substrate/test-utils/runtime/transaction-pool/Cargo.toml
@@ -19,9 +19,9 @@ codec = { workspace = true, default-features = true }
 futures = { workspace = true }
 log = { workspace = true }
 parking_lot = { workspace = true, default-features = true }
-thiserror = { workspace = true }
 sc-transaction-pool = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
+thiserror = { workspace = true }
diff --git a/substrate/utils/binary-merkle-tree/Cargo.toml b/substrate/utils/binary-merkle-tree/Cargo.toml
index 9577d94ef0bfa1e63262ffd267930cffa0ada9e9..86d64face80e01fdc7a86a1f1c9f615223fa936f 100644
--- a/substrate/utils/binary-merkle-tree/Cargo.toml
+++ b/substrate/utils/binary-merkle-tree/Cargo.toml
@@ -12,16 +12,16 @@ homepage.workspace = true
 workspace = true
 
 [dependencies]
-codec = { workspace = true, features = ["derive"] }
 array-bytes = { optional = true, workspace = true, default-features = true }
-log = { optional = true, workspace = true }
+codec = { workspace = true, features = ["derive"] }
 hash-db = { workspace = true }
+log = { optional = true, workspace = true }
 
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
-sp-tracing = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
 
 [features]
 debug = ["array-bytes", "log"]
diff --git a/substrate/utils/frame/benchmarking-cli/Cargo.toml b/substrate/utils/frame/benchmarking-cli/Cargo.toml
index 6d86346ee18028f7f1c869c66aa625288e4bba1a..c38a7e4f77d812f2d22e7b9dcbff52d4459358cc 100644
--- a/substrate/utils/frame/benchmarking-cli/Cargo.toml
+++ b/substrate/utils/frame/benchmarking-cli/Cargo.toml
@@ -16,25 +16,27 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+Inflector = { workspace = true }
 array-bytes = { workspace = true, default-features = true }
 chrono = { workspace = true }
 clap = { features = ["derive"], workspace = true }
 codec = { workspace = true, default-features = true }
 comfy-table = { workspace = true }
+cumulus-client-parachain-inherent = { workspace = true, default-features = true }
+cumulus-primitives-proof-size-hostfunction = { workspace = true, default-features = true }
+frame-benchmarking = { workspace = true, default-features = true }
+frame-support = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
+gethostname = { workspace = true }
 handlebars = { workspace = true }
-Inflector = { workspace = true }
+hex = { workspace = true, default-features = true }
 itertools = { workspace = true }
 linked-hash-map = { workspace = true }
 log = { workspace = true, default-features = true }
+polkadot-parachain-primitives = { workspace = true, default-features = true }
+polkadot-primitives = { workspace = true, default-features = true }
 rand = { features = ["small_rng"], workspace = true, default-features = true }
 rand_pcg = { workspace = true }
-serde = { workspace = true, default-features = true }
-serde_json = { workspace = true, default-features = true }
-thiserror = { workspace = true }
-thousands = { workspace = true }
-frame-benchmarking = { workspace = true, default-features = true }
-frame-support = { workspace = true, default-features = true }
-frame-system = { workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true }
 sc-cli = { workspace = true }
@@ -42,36 +44,34 @@ sc-client-api = { workspace = true, default-features = true }
 sc-client-db = { workspace = true }
 sc-executor = { workspace = true, default-features = true }
 sc-executor-common = { workspace = true }
+sc-runtime-utilities = { workspace = true, default-features = true }
 sc-service = { workspace = true }
 sc-sysinfo = { workspace = true, default-features = true }
-sc-runtime-utilities = { workspace = true, default-features = true }
+serde = { workspace = true, default-features = true }
+serde_json = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
+sp-block-builder = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+sp-crypto-hashing = { workspace = true, default-features = true }
 sp-database = { workspace = true, default-features = true }
 sp-externalities = { workspace = true, default-features = true }
 sp-genesis-builder = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
-sp-crypto-hashing = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-state-machine = { workspace = true, default-features = true }
 sp-storage = { workspace = true, default-features = true }
-sp-trie = { workspace = true, default-features = true }
-sp-block-builder = { workspace = true, default-features = true }
+sp-timestamp = { workspace = true, default-features = true }
 sp-transaction-pool = { workspace = true, default-features = true }
+sp-trie = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
-sp-timestamp = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
 sp-wasm-interface = { workspace = true, default-features = true }
 subxt = { workspace = true, features = ["native"] }
 subxt-signer = { workspace = true, features = ["unstable-eth"] }
-cumulus-primitives-proof-size-hostfunction = { workspace = true, default-features = true }
-cumulus-client-parachain-inherent = { workspace = true, default-features = true }
-polkadot-parachain-primitives = { workspace = true, default-features = true }
-polkadot-primitives = { workspace = true, default-features = true }
-gethostname = { workspace = true }
-hex = { workspace = true, default-features = true }
+thiserror = { workspace = true }
+thousands = { workspace = true }
 
 [dev-dependencies]
 cumulus-test-runtime = { workspace = true, default-features = true }
diff --git a/substrate/utils/frame/generate-bags/Cargo.toml b/substrate/utils/frame/generate-bags/Cargo.toml
index c37c426466992ffceb2aaba60b38fa10f61f1c67..c03f85ece05d873ba2c4477fba5bd639f3bbc538 100644
--- a/substrate/utils/frame/generate-bags/Cargo.toml
+++ b/substrate/utils/frame/generate-bags/Cargo.toml
@@ -13,8 +13,8 @@ workspace = true
 
 [dependencies]
 # FRAME
-frame-support = { workspace = true, default-features = true }
 frame-election-provider-support = { workspace = true, default-features = true }
+frame-support = { workspace = true, default-features = true }
 frame-system = { workspace = true, default-features = true }
 pallet-staking = { workspace = true, default-features = true }
 sp-staking = { workspace = true, default-features = true }
diff --git a/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml b/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
index 3d574864725729e52aeb2d6cbd98d9aebe5eac31..aace0f4ad23f11aa6c37454c103a4adc1a3ef51d 100644
--- a/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
+++ b/substrate/utils/frame/generate-bags/node-runtime/Cargo.toml
@@ -13,8 +13,8 @@ publish = false
 workspace = true
 
 [dependencies]
-kitchensink-runtime = { workspace = true }
 generate-bags = { workspace = true, default-features = true }
+kitchensink-runtime = { workspace = true }
 
 # third-party
 clap = { features = ["derive"], workspace = true }
diff --git a/substrate/utils/frame/omni-bencher/Cargo.toml b/substrate/utils/frame/omni-bencher/Cargo.toml
index 345a7288d45bf2ee6723789eb436b738d03cb1a4..d0d7f1a3428f8d5b2a2a130942e07fd3347587a0 100644
--- a/substrate/utils/frame/omni-bencher/Cargo.toml
+++ b/substrate/utils/frame/omni-bencher/Cargo.toml
@@ -15,16 +15,16 @@ workspace = true
 clap = { features = ["derive"], workspace = true }
 cumulus-primitives-proof-size-hostfunction = { workspace = true, default-features = true }
 frame-benchmarking-cli = { workspace = true }
+log = { workspace = true }
 sc-cli = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-statement-store = { workspace = true, default-features = true }
 tracing-subscriber = { workspace = true }
-log = { workspace = true }
 
 [dev-dependencies]
-tempfile = { workspace = true }
 assert_cmd = { workspace = true }
 cumulus-test-runtime = { workspace = true }
-sp-tracing = { workspace = true, default-features = true }
-sp-genesis-builder = { workspace = true, default-features = true }
 sc-chain-spec = { workspace = true }
+sp-genesis-builder = { workspace = true, default-features = true }
+sp-tracing = { workspace = true, default-features = true }
+tempfile = { workspace = true }
diff --git a/substrate/utils/frame/remote-externalities/Cargo.toml b/substrate/utils/frame/remote-externalities/Cargo.toml
index 41a0091027c13831bb4f7adaad30b2265602173f..4ed0e1edf3e4e6dc1e6f8c9453c3f1eca47d20a9 100644
--- a/substrate/utils/frame/remote-externalities/Cargo.toml
+++ b/substrate/utils/frame/remote-externalities/Cargo.toml
@@ -15,20 +15,20 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-jsonrpsee = { features = ["http-client"], workspace = true }
 codec = { workspace = true, default-features = true }
+futures = { workspace = true }
+indicatif = { workspace = true }
+jsonrpsee = { features = ["http-client"], workspace = true }
 log = { workspace = true, default-features = true }
 serde = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-crypto-hashing = { workspace = true, default-features = true }
-sp-state-machine = { workspace = true, default-features = true }
 sp-io = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-tokio = { features = ["macros", "rt-multi-thread"], workspace = true, default-features = true }
-substrate-rpc-client = { workspace = true, default-features = true }
-futures = { workspace = true }
-indicatif = { workspace = true }
+sp-state-machine = { workspace = true, default-features = true }
 spinners = { workspace = true }
+substrate-rpc-client = { workspace = true, default-features = true }
+tokio = { features = ["macros", "rt-multi-thread"], workspace = true, default-features = true }
 tokio-retry = { workspace = true }
 
 [dev-dependencies]
diff --git a/substrate/utils/frame/rpc/client/Cargo.toml b/substrate/utils/frame/rpc/client/Cargo.toml
index d26be3a131244280b1eefa7707eb35d864c7e442..6282621e1c750e84550d56dbb415d3c9d5adbd9b 100644
--- a/substrate/utils/frame/rpc/client/Cargo.toml
+++ b/substrate/utils/frame/rpc/client/Cargo.toml
@@ -15,13 +15,13 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+async-trait = { workspace = true }
 jsonrpsee = { features = ["ws-client"], workspace = true }
+log = { workspace = true, default-features = true }
 sc-rpc-api = { workspace = true, default-features = true }
-async-trait = { workspace = true }
 serde = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-log = { workspace = true, default-features = true }
 
 [dev-dependencies]
-tokio = { features = ["macros", "rt-multi-thread", "sync"], workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
+tokio = { features = ["macros", "rt-multi-thread", "sync"], workspace = true, default-features = true }
diff --git a/substrate/utils/frame/rpc/support/Cargo.toml b/substrate/utils/frame/rpc/support/Cargo.toml
index 82652c8fa2627a781385a9b16d59727013e82b60..45b2bc6fa9b3a5573614314ad09230889f9c3e64 100644
--- a/substrate/utils/frame/rpc/support/Cargo.toml
+++ b/substrate/utils/frame/rpc/support/Cargo.toml
@@ -16,16 +16,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true, default-features = true }
-jsonrpsee = { features = ["jsonrpsee-types"], workspace = true }
-serde = { workspace = true, default-features = true }
 frame-support = { workspace = true, default-features = true }
+jsonrpsee = { features = ["jsonrpsee-types"], workspace = true }
 sc-rpc-api = { workspace = true, default-features = true }
+serde = { workspace = true, default-features = true }
 sp-storage = { workspace = true, default-features = true }
 
 [dev-dependencies]
-scale-info = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 jsonrpsee = { features = ["jsonrpsee-types", "ws-client"], workspace = true }
-tokio = { workspace = true, default-features = true }
+scale-info = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
-frame-system = { workspace = true, default-features = true }
+tokio = { workspace = true, default-features = true }
diff --git a/substrate/utils/frame/rpc/system/Cargo.toml b/substrate/utils/frame/rpc/system/Cargo.toml
index 5757a48498c7028c9dadefbd7f44b87c140c2a89..68dfbb833c6fef3a34867d70a591e311ee19f44a 100644
--- a/substrate/utils/frame/rpc/system/Cargo.toml
+++ b/substrate/utils/frame/rpc/system/Cargo.toml
@@ -16,16 +16,16 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-futures = { workspace = true }
 codec = { workspace = true, default-features = true }
 docify = { workspace = true }
+frame-system-rpc-runtime-api = { workspace = true, default-features = true }
+futures = { workspace = true }
 jsonrpsee = { features = [
 	"client-core",
 	"macros",
 	"server-core",
 ], workspace = true }
 log = { workspace = true, default-features = true }
-frame-system-rpc-runtime-api = { workspace = true, default-features = true }
 sc-rpc-api = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
@@ -35,8 +35,8 @@ sp-core = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 
 [dev-dependencies]
-sc-transaction-pool = { workspace = true, default-features = true }
-tokio = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
+sc-transaction-pool = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
+tokio = { workspace = true, default-features = true }
diff --git a/substrate/utils/wasm-builder/Cargo.toml b/substrate/utils/wasm-builder/Cargo.toml
index fb15e8619a38af2630ada48b0e136337af492934..6645dd1803bfac3c8315f7f5a747a4e4b2e58d80 100644
--- a/substrate/utils/wasm-builder/Cargo.toml
+++ b/substrate/utils/wasm-builder/Cargo.toml
@@ -18,28 +18,28 @@ targets = ["x86_64-unknown-linux-gnu"]
 build-helper = { workspace = true }
 cargo_metadata = { workspace = true }
 console = { workspace = true }
+filetime = { workspace = true }
+jobserver = { workspace = true }
+parity-wasm = { workspace = true }
+polkavm-linker = { workspace = true }
+sp-maybe-compressed-blob = { workspace = true, default-features = true }
 strum = { features = ["derive"], workspace = true, default-features = true }
 tempfile = { workspace = true }
 toml = { workspace = true }
 walkdir = { workspace = true }
-sp-maybe-compressed-blob = { workspace = true, default-features = true }
-filetime = { workspace = true }
 wasm-opt = { workspace = true }
-parity-wasm = { workspace = true }
-polkavm-linker = { workspace = true }
-jobserver = { workspace = true }
 
 # Dependencies required for the `metadata-hash` feature.
+array-bytes = { optional = true, workspace = true, default-features = true }
+codec = { optional = true, workspace = true, default-features = true }
+frame-metadata = { features = ["current", "unstable"], optional = true, workspace = true, default-features = true }
 merkleized-metadata = { optional = true, workspace = true }
 sc-executor = { optional = true, workspace = true, default-features = true }
+shlex = { workspace = true }
 sp-core = { optional = true, workspace = true, default-features = true }
 sp-io = { optional = true, workspace = true, default-features = true }
-sp-version = { optional = true, workspace = true, default-features = true }
-frame-metadata = { features = ["current", "unstable"], optional = true, workspace = true, default-features = true }
-codec = { optional = true, workspace = true, default-features = true }
-array-bytes = { optional = true, workspace = true, default-features = true }
 sp-tracing = { optional = true, workspace = true, default-features = true }
-shlex = { workspace = true }
+sp-version = { optional = true, workspace = true, default-features = true }
 
 [features]
 # Enable support for generating the metadata hash.
diff --git a/templates/minimal/node/Cargo.toml b/templates/minimal/node/Cargo.toml
index 956efca34532dc896a8d3c07a9dc70611b0acdab..a2a999f02671bc726e8eed954b1f6026f3f7678d 100644
--- a/templates/minimal/node/Cargo.toml
+++ b/templates/minimal/node/Cargo.toml
@@ -14,15 +14,15 @@ build = "build.rs"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-docify = { workspace = true }
 clap = { features = ["derive"], workspace = true }
+docify = { workspace = true }
 futures = { features = ["thread-pool"], workspace = true }
 futures-timer = { workspace = true }
 jsonrpsee = { features = ["server"], workspace = true }
 serde_json = { workspace = true, default-features = true }
 
-polkadot-sdk = { workspace = true, features = ["experimental", "node"] }
 minimal-template-runtime = { workspace = true }
+polkadot-sdk = { workspace = true, features = ["experimental", "node"] }
 
 [build-dependencies]
 polkadot-sdk = { workspace = true, features = ["substrate-build-script-utils"] }
diff --git a/templates/minimal/pallets/template/Cargo.toml b/templates/minimal/pallets/template/Cargo.toml
index 9a02d4daeaac39323773185b67448d00cdfb7bbf..e11ce0e9955ca642a226a6869786e808d5b30eba 100644
--- a/templates/minimal/pallets/template/Cargo.toml
+++ b/templates/minimal/pallets/template/Cargo.toml
@@ -14,11 +14,11 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
-scale-info = { features = ["derive"], workspace = true }
 polkadot-sdk = { workspace = true, default-features = false, features = [
 	"experimental",
 	"runtime",
 ] }
+scale-info = { features = ["derive"], workspace = true }
 
 
 [features]
diff --git a/templates/minimal/runtime/Cargo.toml b/templates/minimal/runtime/Cargo.toml
index b803c74539ef7e2332f2a54b00d4112d86687dfe..1554e92c0bf575a3fd6d4dacb528bd63b31f71aa 100644
--- a/templates/minimal/runtime/Cargo.toml
+++ b/templates/minimal/runtime/Cargo.toml
@@ -11,7 +11,6 @@ publish = false
 
 [dependencies]
 codec = { workspace = true }
-scale-info = { workspace = true }
 polkadot-sdk = { workspace = true, features = [
 	"pallet-balances",
 	"pallet-sudo",
@@ -20,6 +19,7 @@ polkadot-sdk = { workspace = true, features = [
 	"pallet-transaction-payment-rpc-runtime-api",
 	"runtime",
 ] }
+scale-info = { workspace = true }
 serde_json = { workspace = true, default-features = false, features = ["alloc"] }
 
 # local pallet templates
diff --git a/templates/parachain/node/Cargo.toml b/templates/parachain/node/Cargo.toml
index ba5f1212b79c47b5204dff0a8ba2da4a30af3e5a..ec4b13b184fcbe1db86a03f04bfee43a6e2bf81b 100644
--- a/templates/parachain/node/Cargo.toml
+++ b/templates/parachain/node/Cargo.toml
@@ -12,22 +12,22 @@ build = "build.rs"
 
 [dependencies]
 clap = { features = ["derive"], workspace = true }
-log = { workspace = true, default-features = true }
 codec = { workspace = true, default-features = true }
-serde = { features = ["derive"], workspace = true, default-features = true }
-jsonrpsee = { features = ["server"], workspace = true }
+color-print = { workspace = true }
+docify = { workspace = true }
 futures = { workspace = true }
+jsonrpsee = { features = ["server"], workspace = true }
+log = { workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
-docify = { workspace = true }
-color-print = { workspace = true }
 
 polkadot-sdk = { workspace = true, features = ["node"] }
 
 parachain-template-runtime = { workspace = true }
 
 # Substrate
-sc-tracing = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
+sc-tracing = { workspace = true, default-features = true }
 
 [build-dependencies]
 polkadot-sdk = { workspace = true, features = ["substrate-build-script-utils"] }
diff --git a/templates/parachain/runtime/Cargo.toml b/templates/parachain/runtime/Cargo.toml
index f1d33b4143e4440a5b993cfeb351da25ca9c3242..9a0548106ed7b93d5f750396b98f3acdc7d69662 100644
--- a/templates/parachain/runtime/Cargo.toml
+++ b/templates/parachain/runtime/Cargo.toml
@@ -13,17 +13,17 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [build-dependencies]
-substrate-wasm-builder = { optional = true, workspace = true, default-features = true }
 docify = { workspace = true }
+substrate-wasm-builder = { optional = true, workspace = true, default-features = true }
 
 [dependencies]
 codec = { features = ["derive"], workspace = true }
+docify = { workspace = true }
 hex-literal = { optional = true, workspace = true, default-features = true }
 log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
-smallvec = { workspace = true, default-features = true }
-docify = { workspace = true }
 serde_json = { workspace = true, default-features = false, features = ["alloc"] }
+smallvec = { workspace = true, default-features = true }
 
 # Local
 pallet-parachain-template = { workspace = true }
diff --git a/templates/solochain/node/Cargo.toml b/templates/solochain/node/Cargo.toml
index 4c0ab31df95e2b95b0fd1d9fb548c98cf6862d90..90f576c88c23e894dbf8bf6bacd022deedeb39c5 100644
--- a/templates/solochain/node/Cargo.toml
+++ b/templates/solochain/node/Cargo.toml
@@ -17,41 +17,41 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 clap = { features = ["derive"], workspace = true }
 futures = { features = ["thread-pool"], workspace = true }
-serde_json = { workspace = true, default-features = true }
 jsonrpsee = { features = ["server"], workspace = true }
+serde_json = { workspace = true, default-features = true }
 
 # substrate client
+sc-basic-authorship = { workspace = true, default-features = true }
 sc-cli = { workspace = true, default-features = true }
-sp-core = { workspace = true, default-features = true }
+sc-client-api = { workspace = true, default-features = true }
+sc-consensus = { workspace = true, default-features = true }
+sc-consensus-aura = { workspace = true, default-features = true }
+sc-consensus-grandpa = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
+sc-offchain = { workspace = true, default-features = true }
 sc-service = { workspace = true, default-features = true }
 sc-telemetry = { workspace = true, default-features = true }
 sc-transaction-pool = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
-sc-offchain = { workspace = true, default-features = true }
-sc-consensus = { workspace = true, default-features = true }
-sc-consensus-aura = { workspace = true, default-features = true }
 sp-consensus-aura = { workspace = true, default-features = true }
-sc-consensus-grandpa = { workspace = true, default-features = true }
 sp-consensus-grandpa = { workspace = true, default-features = true }
+sp-core = { workspace = true, default-features = true }
 sp-genesis-builder = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-sc-basic-authorship = { workspace = true, default-features = true }
 
 # substrate primitives
-sp-runtime = { workspace = true, default-features = true }
-sp-io = { workspace = true, default-features = true }
-sp-timestamp = { workspace = true, default-features = true }
-sp-inherents = { workspace = true, default-features = true }
-sp-keyring = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
-sp-blockchain = { workspace = true, default-features = true }
 sp-block-builder = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true, default-features = true }
+sp-inherents = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
+sp-keyring = { workspace = true, default-features = true }
+sp-runtime = { workspace = true, default-features = true }
+sp-timestamp = { workspace = true, default-features = true }
 
 # frame and pallets
-frame-system = { workspace = true, default-features = true }
 frame-metadata-hash-extension = { workspace = true, default-features = true }
+frame-system = { workspace = true, default-features = true }
 pallet-transaction-payment = { workspace = true, default-features = true }
 pallet-transaction-payment-rpc = { workspace = true, default-features = true }
 substrate-frame-rpc-system = { workspace = true, default-features = true }
diff --git a/templates/solochain/runtime/Cargo.toml b/templates/solochain/runtime/Cargo.toml
index 837849e844b16f82a5b6eb6375ce00367a2dcd3c..1cff982fbf3c6db648b5c79e0f8f1d25dd462728 100644
--- a/templates/solochain/runtime/Cargo.toml
+++ b/templates/solochain/runtime/Cargo.toml
@@ -23,11 +23,11 @@ scale-info = { features = [
 serde_json = { workspace = true, default-features = false, features = ["alloc"] }
 
 # frame
+frame-executive = { workspace = true }
+frame-metadata-hash-extension = { workspace = true }
 frame-support = { features = ["experimental"], workspace = true }
 frame-system = { workspace = true }
 frame-try-runtime = { optional = true, workspace = true }
-frame-executive = { workspace = true }
-frame-metadata-hash-extension = { workspace = true }
 
 # frame pallets
 pallet-aura = { workspace = true }
@@ -46,11 +46,12 @@ sp-consensus-aura = { features = [
 sp-consensus-grandpa = { features = [
 	"serde",
 ], workspace = true }
-sp-keyring = { workspace = true }
 sp-core = { features = [
 	"serde",
 ], workspace = true }
+sp-genesis-builder = { workspace = true }
 sp-inherents = { workspace = true }
+sp-keyring = { workspace = true }
 sp-offchain = { workspace = true }
 sp-runtime = { features = [
 	"serde",
@@ -61,7 +62,6 @@ sp-transaction-pool = { workspace = true }
 sp-version = { features = [
 	"serde",
 ], workspace = true }
-sp-genesis-builder = { workspace = true }
 
 # RPC related
 frame-system-rpc-runtime-api = { workspace = true }
diff --git a/templates/zombienet/Cargo.toml b/templates/zombienet/Cargo.toml
index f29325dbe6a90ae45fbd39cec85a804ac753ee8b..805e4ddbcee28a33fd2b30f1e6e6082e87750059 100644
--- a/templates/zombienet/Cargo.toml
+++ b/templates/zombienet/Cargo.toml
@@ -10,10 +10,10 @@ edition.workspace = true
 publish = false
 
 [dependencies]
+anyhow = { workspace = true }
 env_logger = { workspace = true }
 log = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread"] }
-anyhow = { workspace = true }
 zombienet-sdk = { workspace = true }
 
 [features]
diff --git a/umbrella/Cargo.toml b/umbrella/Cargo.toml
index 68d71b4a5d5ee685b1370480730da65eff6ba901..f36d39d63f6ae9640a7f8eb38e3ddf744475a620 100644
--- a/umbrella/Cargo.toml
+++ b/umbrella/Cargo.toml
@@ -624,1884 +624,1884 @@ workspace = true
 workspace = true
 
 [dependencies.assets-common]
-path = "../cumulus/parachains/runtimes/assets/common"
 default-features = false
 optional = true
+path = "../cumulus/parachains/runtimes/assets/common"
 
 [dependencies.binary-merkle-tree]
-path = "../substrate/utils/binary-merkle-tree"
 default-features = false
 optional = true
+path = "../substrate/utils/binary-merkle-tree"
 
 [dependencies.bp-header-chain]
-path = "../bridges/primitives/header-chain"
 default-features = false
 optional = true
+path = "../bridges/primitives/header-chain"
 
 [dependencies.bp-messages]
-path = "../bridges/primitives/messages"
 default-features = false
 optional = true
+path = "../bridges/primitives/messages"
 
 [dependencies.bp-parachains]
-path = "../bridges/primitives/parachains"
 default-features = false
 optional = true
+path = "../bridges/primitives/parachains"
 
 [dependencies.bp-polkadot]
-path = "../bridges/chains/chain-polkadot"
 default-features = false
 optional = true
+path = "../bridges/chains/chain-polkadot"
 
 [dependencies.bp-polkadot-core]
-path = "../bridges/primitives/polkadot-core"
 default-features = false
 optional = true
+path = "../bridges/primitives/polkadot-core"
 
 [dependencies.bp-relayers]
-path = "../bridges/primitives/relayers"
 default-features = false
 optional = true
+path = "../bridges/primitives/relayers"
 
 [dependencies.bp-runtime]
-path = "../bridges/primitives/runtime"
 default-features = false
 optional = true
+path = "../bridges/primitives/runtime"
 
 [dependencies.bp-test-utils]
-path = "../bridges/primitives/test-utils"
 default-features = false
 optional = true
+path = "../bridges/primitives/test-utils"
 
 [dependencies.bp-xcm-bridge-hub]
-path = "../bridges/primitives/xcm-bridge-hub"
 default-features = false
 optional = true
+path = "../bridges/primitives/xcm-bridge-hub"
 
 [dependencies.bp-xcm-bridge-hub-router]
-path = "../bridges/primitives/xcm-bridge-hub-router"
 default-features = false
 optional = true
+path = "../bridges/primitives/xcm-bridge-hub-router"
 
 [dependencies.bridge-hub-common]
-path = "../cumulus/parachains/runtimes/bridge-hubs/common"
 default-features = false
 optional = true
+path = "../cumulus/parachains/runtimes/bridge-hubs/common"
 
 [dependencies.bridge-runtime-common]
-path = "../bridges/bin/runtime-common"
 default-features = false
 optional = true
+path = "../bridges/bin/runtime-common"
 
 [dependencies.cumulus-pallet-aura-ext]
-path = "../cumulus/pallets/aura-ext"
 default-features = false
 optional = true
+path = "../cumulus/pallets/aura-ext"
 
 [dependencies.cumulus-pallet-dmp-queue]
-path = "../cumulus/pallets/dmp-queue"
 default-features = false
 optional = true
+path = "../cumulus/pallets/dmp-queue"
 
 [dependencies.cumulus-pallet-parachain-system]
-path = "../cumulus/pallets/parachain-system"
 default-features = false
 optional = true
+path = "../cumulus/pallets/parachain-system"
 
 [dependencies.cumulus-pallet-parachain-system-proc-macro]
-path = "../cumulus/pallets/parachain-system/proc-macro"
 default-features = false
 optional = true
+path = "../cumulus/pallets/parachain-system/proc-macro"
 
 [dependencies.cumulus-pallet-session-benchmarking]
-path = "../cumulus/pallets/session-benchmarking"
 default-features = false
 optional = true
+path = "../cumulus/pallets/session-benchmarking"
 
 [dependencies.cumulus-pallet-solo-to-para]
-path = "../cumulus/pallets/solo-to-para"
 default-features = false
 optional = true
+path = "../cumulus/pallets/solo-to-para"
 
 [dependencies.cumulus-pallet-xcm]
-path = "../cumulus/pallets/xcm"
 default-features = false
 optional = true
+path = "../cumulus/pallets/xcm"
 
 [dependencies.cumulus-pallet-xcmp-queue]
-path = "../cumulus/pallets/xcmp-queue"
 default-features = false
 optional = true
+path = "../cumulus/pallets/xcmp-queue"
 
 [dependencies.cumulus-ping]
-path = "../cumulus/parachains/pallets/ping"
 default-features = false
 optional = true
+path = "../cumulus/parachains/pallets/ping"
 
 [dependencies.cumulus-primitives-aura]
-path = "../cumulus/primitives/aura"
 default-features = false
 optional = true
+path = "../cumulus/primitives/aura"
 
 [dependencies.cumulus-primitives-core]
-path = "../cumulus/primitives/core"
 default-features = false
 optional = true
+path = "../cumulus/primitives/core"
 
 [dependencies.cumulus-primitives-parachain-inherent]
-path = "../cumulus/primitives/parachain-inherent"
 default-features = false
 optional = true
+path = "../cumulus/primitives/parachain-inherent"
 
 [dependencies.cumulus-primitives-proof-size-hostfunction]
-path = "../cumulus/primitives/proof-size-hostfunction"
 default-features = false
 optional = true
+path = "../cumulus/primitives/proof-size-hostfunction"
 
 [dependencies.cumulus-primitives-storage-weight-reclaim]
-path = "../cumulus/primitives/storage-weight-reclaim"
 default-features = false
 optional = true
+path = "../cumulus/primitives/storage-weight-reclaim"
 
 [dependencies.cumulus-primitives-timestamp]
-path = "../cumulus/primitives/timestamp"
 default-features = false
 optional = true
+path = "../cumulus/primitives/timestamp"
 
 [dependencies.cumulus-primitives-utility]
-path = "../cumulus/primitives/utility"
 default-features = false
 optional = true
+path = "../cumulus/primitives/utility"
 
 [dependencies.frame-benchmarking]
-path = "../substrate/frame/benchmarking"
 default-features = false
 optional = true
+path = "../substrate/frame/benchmarking"
 
 [dependencies.frame-benchmarking-pallet-pov]
-path = "../substrate/frame/benchmarking/pov"
 default-features = false
 optional = true
+path = "../substrate/frame/benchmarking/pov"
 
 [dependencies.frame-election-provider-solution-type]
-path = "../substrate/frame/election-provider-support/solution-type"
 default-features = false
 optional = true
+path = "../substrate/frame/election-provider-support/solution-type"
 
 [dependencies.frame-election-provider-support]
-path = "../substrate/frame/election-provider-support"
 default-features = false
 optional = true
+path = "../substrate/frame/election-provider-support"
 
 [dependencies.frame-executive]
-path = "../substrate/frame/executive"
 default-features = false
 optional = true
+path = "../substrate/frame/executive"
 
 [dependencies.frame-metadata-hash-extension]
-path = "../substrate/frame/metadata-hash-extension"
 default-features = false
 optional = true
+path = "../substrate/frame/metadata-hash-extension"
 
 [dependencies.frame-support]
-path = "../substrate/frame/support"
 default-features = false
 optional = true
+path = "../substrate/frame/support"
 
 [dependencies.frame-support-procedural]
-path = "../substrate/frame/support/procedural"
 default-features = false
 optional = true
+path = "../substrate/frame/support/procedural"
 
 [dependencies.frame-support-procedural-tools-derive]
-path = "../substrate/frame/support/procedural/tools/derive"
 default-features = false
 optional = true
+path = "../substrate/frame/support/procedural/tools/derive"
 
 [dependencies.frame-system]
-path = "../substrate/frame/system"
 default-features = false
 optional = true
+path = "../substrate/frame/system"
 
 [dependencies.frame-system-benchmarking]
-path = "../substrate/frame/system/benchmarking"
 default-features = false
 optional = true
+path = "../substrate/frame/system/benchmarking"
 
 [dependencies.frame-system-rpc-runtime-api]
-path = "../substrate/frame/system/rpc/runtime-api"
 default-features = false
 optional = true
+path = "../substrate/frame/system/rpc/runtime-api"
 
 [dependencies.frame-try-runtime]
-path = "../substrate/frame/try-runtime"
 default-features = false
 optional = true
+path = "../substrate/frame/try-runtime"
 
 [dependencies.pallet-alliance]
-path = "../substrate/frame/alliance"
 default-features = false
 optional = true
+path = "../substrate/frame/alliance"
 
 [dependencies.pallet-asset-conversion]
-path = "../substrate/frame/asset-conversion"
 default-features = false
 optional = true
+path = "../substrate/frame/asset-conversion"
 
 [dependencies.pallet-asset-conversion-ops]
-path = "../substrate/frame/asset-conversion/ops"
 default-features = false
 optional = true
+path = "../substrate/frame/asset-conversion/ops"
 
 [dependencies.pallet-asset-conversion-tx-payment]
-path = "../substrate/frame/transaction-payment/asset-conversion-tx-payment"
 default-features = false
 optional = true
+path = "../substrate/frame/transaction-payment/asset-conversion-tx-payment"
 
 [dependencies.pallet-asset-rate]
-path = "../substrate/frame/asset-rate"
 default-features = false
 optional = true
+path = "../substrate/frame/asset-rate"
 
 [dependencies.pallet-asset-tx-payment]
-path = "../substrate/frame/transaction-payment/asset-tx-payment"
 default-features = false
 optional = true
+path = "../substrate/frame/transaction-payment/asset-tx-payment"
 
 [dependencies.pallet-assets]
-path = "../substrate/frame/assets"
 default-features = false
 optional = true
+path = "../substrate/frame/assets"
 
 [dependencies.pallet-assets-freezer]
-path = "../substrate/frame/assets-freezer"
 default-features = false
 optional = true
+path = "../substrate/frame/assets-freezer"
 
 [dependencies.pallet-atomic-swap]
-path = "../substrate/frame/atomic-swap"
 default-features = false
 optional = true
+path = "../substrate/frame/atomic-swap"
 
 [dependencies.pallet-aura]
-path = "../substrate/frame/aura"
 default-features = false
 optional = true
+path = "../substrate/frame/aura"
 
 [dependencies.pallet-authority-discovery]
-path = "../substrate/frame/authority-discovery"
 default-features = false
 optional = true
+path = "../substrate/frame/authority-discovery"
 
 [dependencies.pallet-authorship]
-path = "../substrate/frame/authorship"
 default-features = false
 optional = true
+path = "../substrate/frame/authorship"
 
 [dependencies.pallet-babe]
-path = "../substrate/frame/babe"
 default-features = false
 optional = true
+path = "../substrate/frame/babe"
 
 [dependencies.pallet-bags-list]
-path = "../substrate/frame/bags-list"
 default-features = false
 optional = true
+path = "../substrate/frame/bags-list"
 
 [dependencies.pallet-balances]
-path = "../substrate/frame/balances"
 default-features = false
 optional = true
+path = "../substrate/frame/balances"
 
 [dependencies.pallet-beefy]
-path = "../substrate/frame/beefy"
 default-features = false
 optional = true
+path = "../substrate/frame/beefy"
 
 [dependencies.pallet-beefy-mmr]
-path = "../substrate/frame/beefy-mmr"
 default-features = false
 optional = true
+path = "../substrate/frame/beefy-mmr"
 
 [dependencies.pallet-bounties]
-path = "../substrate/frame/bounties"
 default-features = false
 optional = true
+path = "../substrate/frame/bounties"
 
 [dependencies.pallet-bridge-grandpa]
-path = "../bridges/modules/grandpa"
 default-features = false
 optional = true
+path = "../bridges/modules/grandpa"
 
 [dependencies.pallet-bridge-messages]
-path = "../bridges/modules/messages"
 default-features = false
 optional = true
+path = "../bridges/modules/messages"
 
 [dependencies.pallet-bridge-parachains]
-path = "../bridges/modules/parachains"
 default-features = false
 optional = true
+path = "../bridges/modules/parachains"
 
 [dependencies.pallet-bridge-relayers]
-path = "../bridges/modules/relayers"
 default-features = false
 optional = true
+path = "../bridges/modules/relayers"
 
 [dependencies.pallet-broker]
-path = "../substrate/frame/broker"
 default-features = false
 optional = true
+path = "../substrate/frame/broker"
 
 [dependencies.pallet-child-bounties]
-path = "../substrate/frame/child-bounties"
 default-features = false
 optional = true
+path = "../substrate/frame/child-bounties"
 
 [dependencies.pallet-collator-selection]
-path = "../cumulus/pallets/collator-selection"
 default-features = false
 optional = true
+path = "../cumulus/pallets/collator-selection"
 
 [dependencies.pallet-collective]
-path = "../substrate/frame/collective"
 default-features = false
 optional = true
+path = "../substrate/frame/collective"
 
 [dependencies.pallet-collective-content]
-path = "../cumulus/parachains/pallets/collective-content"
 default-features = false
 optional = true
+path = "../cumulus/parachains/pallets/collective-content"
 
 [dependencies.pallet-contracts]
-path = "../substrate/frame/contracts"
 default-features = false
 optional = true
+path = "../substrate/frame/contracts"
 
 [dependencies.pallet-contracts-proc-macro]
-path = "../substrate/frame/contracts/proc-macro"
 default-features = false
 optional = true
+path = "../substrate/frame/contracts/proc-macro"
 
 [dependencies.pallet-contracts-uapi]
-path = "../substrate/frame/contracts/uapi"
 default-features = false
 optional = true
+path = "../substrate/frame/contracts/uapi"
 
 [dependencies.pallet-conviction-voting]
-path = "../substrate/frame/conviction-voting"
 default-features = false
 optional = true
+path = "../substrate/frame/conviction-voting"
 
 [dependencies.pallet-core-fellowship]
-path = "../substrate/frame/core-fellowship"
 default-features = false
 optional = true
+path = "../substrate/frame/core-fellowship"
 
 [dependencies.pallet-delegated-staking]
-path = "../substrate/frame/delegated-staking"
 default-features = false
 optional = true
+path = "../substrate/frame/delegated-staking"
 
 [dependencies.pallet-democracy]
-path = "../substrate/frame/democracy"
 default-features = false
 optional = true
+path = "../substrate/frame/democracy"
 
 [dependencies.pallet-dev-mode]
-path = "../substrate/frame/examples/dev-mode"
 default-features = false
 optional = true
+path = "../substrate/frame/examples/dev-mode"
 
 [dependencies.pallet-election-provider-multi-phase]
-path = "../substrate/frame/election-provider-multi-phase"
 default-features = false
 optional = true
+path = "../substrate/frame/election-provider-multi-phase"
 
 [dependencies.pallet-election-provider-support-benchmarking]
-path = "../substrate/frame/election-provider-support/benchmarking"
 default-features = false
 optional = true
+path = "../substrate/frame/election-provider-support/benchmarking"
 
 [dependencies.pallet-elections-phragmen]
-path = "../substrate/frame/elections-phragmen"
 default-features = false
 optional = true
+path = "../substrate/frame/elections-phragmen"
 
 [dependencies.pallet-fast-unstake]
-path = "../substrate/frame/fast-unstake"
 default-features = false
 optional = true
+path = "../substrate/frame/fast-unstake"
 
 [dependencies.pallet-glutton]
-path = "../substrate/frame/glutton"
 default-features = false
 optional = true
+path = "../substrate/frame/glutton"
 
 [dependencies.pallet-grandpa]
-path = "../substrate/frame/grandpa"
 default-features = false
 optional = true
+path = "../substrate/frame/grandpa"
 
 [dependencies.pallet-identity]
-path = "../substrate/frame/identity"
 default-features = false
 optional = true
+path = "../substrate/frame/identity"
 
 [dependencies.pallet-im-online]
-path = "../substrate/frame/im-online"
 default-features = false
 optional = true
+path = "../substrate/frame/im-online"
 
 [dependencies.pallet-indices]
-path = "../substrate/frame/indices"
 default-features = false
 optional = true
+path = "../substrate/frame/indices"
 
 [dependencies.pallet-insecure-randomness-collective-flip]
-path = "../substrate/frame/insecure-randomness-collective-flip"
 default-features = false
 optional = true
+path = "../substrate/frame/insecure-randomness-collective-flip"
 
 [dependencies.pallet-lottery]
-path = "../substrate/frame/lottery"
 default-features = false
 optional = true
+path = "../substrate/frame/lottery"
 
 [dependencies.pallet-membership]
-path = "../substrate/frame/membership"
 default-features = false
 optional = true
+path = "../substrate/frame/membership"
 
 [dependencies.pallet-message-queue]
-path = "../substrate/frame/message-queue"
 default-features = false
 optional = true
+path = "../substrate/frame/message-queue"
 
 [dependencies.pallet-migrations]
-path = "../substrate/frame/migrations"
 default-features = false
 optional = true
+path = "../substrate/frame/migrations"
 
 [dependencies.pallet-mixnet]
-path = "../substrate/frame/mixnet"
 default-features = false
 optional = true
+path = "../substrate/frame/mixnet"
 
 [dependencies.pallet-mmr]
-path = "../substrate/frame/merkle-mountain-range"
 default-features = false
 optional = true
+path = "../substrate/frame/merkle-mountain-range"
 
 [dependencies.pallet-multisig]
-path = "../substrate/frame/multisig"
 default-features = false
 optional = true
+path = "../substrate/frame/multisig"
 
 [dependencies.pallet-nft-fractionalization]
-path = "../substrate/frame/nft-fractionalization"
 default-features = false
 optional = true
+path = "../substrate/frame/nft-fractionalization"
 
 [dependencies.pallet-nfts]
-path = "../substrate/frame/nfts"
 default-features = false
 optional = true
+path = "../substrate/frame/nfts"
 
 [dependencies.pallet-nfts-runtime-api]
-path = "../substrate/frame/nfts/runtime-api"
 default-features = false
 optional = true
+path = "../substrate/frame/nfts/runtime-api"
 
 [dependencies.pallet-nis]
-path = "../substrate/frame/nis"
 default-features = false
 optional = true
+path = "../substrate/frame/nis"
 
 [dependencies.pallet-node-authorization]
-path = "../substrate/frame/node-authorization"
 default-features = false
 optional = true
+path = "../substrate/frame/node-authorization"
 
 [dependencies.pallet-nomination-pools]
-path = "../substrate/frame/nomination-pools"
 default-features = false
 optional = true
+path = "../substrate/frame/nomination-pools"
 
 [dependencies.pallet-nomination-pools-benchmarking]
-path = "../substrate/frame/nomination-pools/benchmarking"
 default-features = false
 optional = true
+path = "../substrate/frame/nomination-pools/benchmarking"
 
 [dependencies.pallet-nomination-pools-runtime-api]
-path = "../substrate/frame/nomination-pools/runtime-api"
 default-features = false
 optional = true
+path = "../substrate/frame/nomination-pools/runtime-api"
 
 [dependencies.pallet-offences]
-path = "../substrate/frame/offences"
 default-features = false
 optional = true
+path = "../substrate/frame/offences"
 
 [dependencies.pallet-offences-benchmarking]
-path = "../substrate/frame/offences/benchmarking"
 default-features = false
 optional = true
+path = "../substrate/frame/offences/benchmarking"
 
 [dependencies.pallet-paged-list]
-path = "../substrate/frame/paged-list"
 default-features = false
 optional = true
+path = "../substrate/frame/paged-list"
 
 [dependencies.pallet-parameters]
-path = "../substrate/frame/parameters"
 default-features = false
 optional = true
+path = "../substrate/frame/parameters"
 
 [dependencies.pallet-preimage]
-path = "../substrate/frame/preimage"
 default-features = false
 optional = true
+path = "../substrate/frame/preimage"
 
 [dependencies.pallet-proxy]
-path = "../substrate/frame/proxy"
 default-features = false
 optional = true
+path = "../substrate/frame/proxy"
 
 [dependencies.pallet-ranked-collective]
-path = "../substrate/frame/ranked-collective"
 default-features = false
 optional = true
+path = "../substrate/frame/ranked-collective"
 
 [dependencies.pallet-recovery]
-path = "../substrate/frame/recovery"
 default-features = false
 optional = true
+path = "../substrate/frame/recovery"
 
 [dependencies.pallet-referenda]
-path = "../substrate/frame/referenda"
 default-features = false
 optional = true
+path = "../substrate/frame/referenda"
 
 [dependencies.pallet-remark]
-path = "../substrate/frame/remark"
 default-features = false
 optional = true
+path = "../substrate/frame/remark"
 
 [dependencies.pallet-revive]
-path = "../substrate/frame/revive"
 default-features = false
 optional = true
+path = "../substrate/frame/revive"
 
 [dependencies.pallet-revive-proc-macro]
-path = "../substrate/frame/revive/proc-macro"
 default-features = false
 optional = true
+path = "../substrate/frame/revive/proc-macro"
 
 [dependencies.pallet-revive-uapi]
-path = "../substrate/frame/revive/uapi"
 default-features = false
 optional = true
+path = "../substrate/frame/revive/uapi"
 
 [dependencies.pallet-root-offences]
-path = "../substrate/frame/root-offences"
 default-features = false
 optional = true
+path = "../substrate/frame/root-offences"
 
 [dependencies.pallet-root-testing]
-path = "../substrate/frame/root-testing"
 default-features = false
 optional = true
+path = "../substrate/frame/root-testing"
 
 [dependencies.pallet-safe-mode]
-path = "../substrate/frame/safe-mode"
 default-features = false
 optional = true
+path = "../substrate/frame/safe-mode"
 
 [dependencies.pallet-salary]
-path = "../substrate/frame/salary"
 default-features = false
 optional = true
+path = "../substrate/frame/salary"
 
 [dependencies.pallet-scheduler]
-path = "../substrate/frame/scheduler"
 default-features = false
 optional = true
+path = "../substrate/frame/scheduler"
 
 [dependencies.pallet-scored-pool]
-path = "../substrate/frame/scored-pool"
 default-features = false
 optional = true
+path = "../substrate/frame/scored-pool"
 
 [dependencies.pallet-session]
-path = "../substrate/frame/session"
 default-features = false
 optional = true
+path = "../substrate/frame/session"
 
 [dependencies.pallet-session-benchmarking]
-path = "../substrate/frame/session/benchmarking"
 default-features = false
 optional = true
+path = "../substrate/frame/session/benchmarking"
 
 [dependencies.pallet-skip-feeless-payment]
-path = "../substrate/frame/transaction-payment/skip-feeless-payment"
 default-features = false
 optional = true
+path = "../substrate/frame/transaction-payment/skip-feeless-payment"
 
 [dependencies.pallet-society]
-path = "../substrate/frame/society"
 default-features = false
 optional = true
+path = "../substrate/frame/society"
 
 [dependencies.pallet-staking]
-path = "../substrate/frame/staking"
 default-features = false
 optional = true
+path = "../substrate/frame/staking"
 
 [dependencies.pallet-staking-reward-curve]
-path = "../substrate/frame/staking/reward-curve"
 default-features = false
 optional = true
+path = "../substrate/frame/staking/reward-curve"
 
 [dependencies.pallet-staking-reward-fn]
-path = "../substrate/frame/staking/reward-fn"
 default-features = false
 optional = true
+path = "../substrate/frame/staking/reward-fn"
 
 [dependencies.pallet-staking-runtime-api]
-path = "../substrate/frame/staking/runtime-api"
 default-features = false
 optional = true
+path = "../substrate/frame/staking/runtime-api"
 
 [dependencies.pallet-state-trie-migration]
-path = "../substrate/frame/state-trie-migration"
 default-features = false
 optional = true
+path = "../substrate/frame/state-trie-migration"
 
 [dependencies.pallet-statement]
-path = "../substrate/frame/statement"
 default-features = false
 optional = true
+path = "../substrate/frame/statement"
 
 [dependencies.pallet-sudo]
-path = "../substrate/frame/sudo"
 default-features = false
 optional = true
+path = "../substrate/frame/sudo"
 
 [dependencies.pallet-timestamp]
-path = "../substrate/frame/timestamp"
 default-features = false
 optional = true
+path = "../substrate/frame/timestamp"
 
 [dependencies.pallet-tips]
-path = "../substrate/frame/tips"
 default-features = false
 optional = true
+path = "../substrate/frame/tips"
 
 [dependencies.pallet-transaction-payment]
-path = "../substrate/frame/transaction-payment"
 default-features = false
 optional = true
+path = "../substrate/frame/transaction-payment"
 
 [dependencies.pallet-transaction-payment-rpc-runtime-api]
-path = "../substrate/frame/transaction-payment/rpc/runtime-api"
 default-features = false
 optional = true
+path = "../substrate/frame/transaction-payment/rpc/runtime-api"
 
 [dependencies.pallet-transaction-storage]
-path = "../substrate/frame/transaction-storage"
 default-features = false
 optional = true
+path = "../substrate/frame/transaction-storage"
 
 [dependencies.pallet-treasury]
-path = "../substrate/frame/treasury"
 default-features = false
 optional = true
+path = "../substrate/frame/treasury"
 
 [dependencies.pallet-tx-pause]
-path = "../substrate/frame/tx-pause"
 default-features = false
 optional = true
+path = "../substrate/frame/tx-pause"
 
 [dependencies.pallet-uniques]
-path = "../substrate/frame/uniques"
 default-features = false
 optional = true
+path = "../substrate/frame/uniques"
 
 [dependencies.pallet-utility]
-path = "../substrate/frame/utility"
 default-features = false
 optional = true
+path = "../substrate/frame/utility"
 
 [dependencies.pallet-verify-signature]
-path = "../substrate/frame/verify-signature"
 default-features = false
 optional = true
+path = "../substrate/frame/verify-signature"
 
 [dependencies.pallet-vesting]
-path = "../substrate/frame/vesting"
 default-features = false
 optional = true
+path = "../substrate/frame/vesting"
 
 [dependencies.pallet-whitelist]
-path = "../substrate/frame/whitelist"
 default-features = false
 optional = true
+path = "../substrate/frame/whitelist"
 
 [dependencies.pallet-xcm]
-path = "../polkadot/xcm/pallet-xcm"
 default-features = false
 optional = true
+path = "../polkadot/xcm/pallet-xcm"
 
 [dependencies.pallet-xcm-benchmarks]
-path = "../polkadot/xcm/pallet-xcm-benchmarks"
 default-features = false
 optional = true
+path = "../polkadot/xcm/pallet-xcm-benchmarks"
 
 [dependencies.pallet-xcm-bridge-hub]
-path = "../bridges/modules/xcm-bridge-hub"
 default-features = false
 optional = true
+path = "../bridges/modules/xcm-bridge-hub"
 
 [dependencies.pallet-xcm-bridge-hub-router]
-path = "../bridges/modules/xcm-bridge-hub-router"
 default-features = false
 optional = true
+path = "../bridges/modules/xcm-bridge-hub-router"
 
 [dependencies.parachains-common]
-path = "../cumulus/parachains/common"
 default-features = false
 optional = true
+path = "../cumulus/parachains/common"
 
 [dependencies.polkadot-core-primitives]
-path = "../polkadot/core-primitives"
 default-features = false
 optional = true
+path = "../polkadot/core-primitives"
 
 [dependencies.polkadot-parachain-primitives]
-path = "../polkadot/parachain"
 default-features = false
 optional = true
+path = "../polkadot/parachain"
 
 [dependencies.polkadot-primitives]
-path = "../polkadot/primitives"
 default-features = false
 optional = true
+path = "../polkadot/primitives"
 
 [dependencies.polkadot-runtime-common]
-path = "../polkadot/runtime/common"
 default-features = false
 optional = true
+path = "../polkadot/runtime/common"
 
 [dependencies.polkadot-runtime-metrics]
-path = "../polkadot/runtime/metrics"
 default-features = false
 optional = true
+path = "../polkadot/runtime/metrics"
 
 [dependencies.polkadot-runtime-parachains]
-path = "../polkadot/runtime/parachains"
 default-features = false
 optional = true
+path = "../polkadot/runtime/parachains"
 
 [dependencies.polkadot-sdk-frame]
-path = "../substrate/frame"
 default-features = false
 optional = true
+path = "../substrate/frame"
 
 [dependencies.sc-chain-spec-derive]
-path = "../substrate/client/chain-spec/derive"
 default-features = false
 optional = true
+path = "../substrate/client/chain-spec/derive"
 
 [dependencies.sc-tracing-proc-macro]
-path = "../substrate/client/tracing/proc-macro"
 default-features = false
 optional = true
+path = "../substrate/client/tracing/proc-macro"
 
 [dependencies.slot-range-helper]
-path = "../polkadot/runtime/common/slot_range_helper"
 default-features = false
 optional = true
+path = "../polkadot/runtime/common/slot_range_helper"
 
 [dependencies.snowbridge-beacon-primitives]
-path = "../bridges/snowbridge/primitives/beacon"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/primitives/beacon"
 
 [dependencies.snowbridge-core]
-path = "../bridges/snowbridge/primitives/core"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/primitives/core"
 
 [dependencies.snowbridge-ethereum]
-path = "../bridges/snowbridge/primitives/ethereum"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/primitives/ethereum"
 
 [dependencies.snowbridge-outbound-queue-merkle-tree]
-path = "../bridges/snowbridge/pallets/outbound-queue/merkle-tree"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/outbound-queue/merkle-tree"
 
 [dependencies.snowbridge-outbound-queue-runtime-api]
-path = "../bridges/snowbridge/pallets/outbound-queue/runtime-api"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/outbound-queue/runtime-api"
 
 [dependencies.snowbridge-pallet-ethereum-client]
-path = "../bridges/snowbridge/pallets/ethereum-client"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/ethereum-client"
 
 [dependencies.snowbridge-pallet-ethereum-client-fixtures]
-path = "../bridges/snowbridge/pallets/ethereum-client/fixtures"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/ethereum-client/fixtures"
 
 [dependencies.snowbridge-pallet-inbound-queue]
-path = "../bridges/snowbridge/pallets/inbound-queue"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/inbound-queue"
 
 [dependencies.snowbridge-pallet-inbound-queue-fixtures]
-path = "../bridges/snowbridge/pallets/inbound-queue/fixtures"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/inbound-queue/fixtures"
 
 [dependencies.snowbridge-pallet-outbound-queue]
-path = "../bridges/snowbridge/pallets/outbound-queue"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/outbound-queue"
 
 [dependencies.snowbridge-pallet-system]
-path = "../bridges/snowbridge/pallets/system"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/system"
 
 [dependencies.snowbridge-router-primitives]
-path = "../bridges/snowbridge/primitives/router"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/primitives/router"
 
 [dependencies.snowbridge-runtime-common]
-path = "../bridges/snowbridge/runtime/runtime-common"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/runtime/runtime-common"
 
 [dependencies.snowbridge-system-runtime-api]
-path = "../bridges/snowbridge/pallets/system/runtime-api"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/pallets/system/runtime-api"
 
 [dependencies.sp-api]
-path = "../substrate/primitives/api"
 default-features = false
 optional = true
+path = "../substrate/primitives/api"
 
 [dependencies.sp-api-proc-macro]
-path = "../substrate/primitives/api/proc-macro"
 default-features = false
 optional = true
+path = "../substrate/primitives/api/proc-macro"
 
 [dependencies.sp-application-crypto]
-path = "../substrate/primitives/application-crypto"
 default-features = false
 optional = true
+path = "../substrate/primitives/application-crypto"
 
 [dependencies.sp-arithmetic]
-path = "../substrate/primitives/arithmetic"
 default-features = false
 optional = true
+path = "../substrate/primitives/arithmetic"
 
 [dependencies.sp-authority-discovery]
-path = "../substrate/primitives/authority-discovery"
 default-features = false
 optional = true
+path = "../substrate/primitives/authority-discovery"
 
 [dependencies.sp-block-builder]
-path = "../substrate/primitives/block-builder"
 default-features = false
 optional = true
+path = "../substrate/primitives/block-builder"
 
 [dependencies.sp-consensus-aura]
-path = "../substrate/primitives/consensus/aura"
 default-features = false
 optional = true
+path = "../substrate/primitives/consensus/aura"
 
 [dependencies.sp-consensus-babe]
-path = "../substrate/primitives/consensus/babe"
 default-features = false
 optional = true
+path = "../substrate/primitives/consensus/babe"
 
 [dependencies.sp-consensus-beefy]
-path = "../substrate/primitives/consensus/beefy"
 default-features = false
 optional = true
+path = "../substrate/primitives/consensus/beefy"
 
 [dependencies.sp-consensus-grandpa]
-path = "../substrate/primitives/consensus/grandpa"
 default-features = false
 optional = true
+path = "../substrate/primitives/consensus/grandpa"
 
 [dependencies.sp-consensus-pow]
-path = "../substrate/primitives/consensus/pow"
 default-features = false
 optional = true
+path = "../substrate/primitives/consensus/pow"
 
 [dependencies.sp-consensus-slots]
-path = "../substrate/primitives/consensus/slots"
 default-features = false
 optional = true
+path = "../substrate/primitives/consensus/slots"
 
 [dependencies.sp-core]
-path = "../substrate/primitives/core"
 default-features = false
 optional = true
+path = "../substrate/primitives/core"
 
 [dependencies.sp-crypto-ec-utils]
-path = "../substrate/primitives/crypto/ec-utils"
 default-features = false
 optional = true
+path = "../substrate/primitives/crypto/ec-utils"
 
 [dependencies.sp-crypto-hashing]
-path = "../substrate/primitives/crypto/hashing"
 default-features = false
 optional = true
+path = "../substrate/primitives/crypto/hashing"
 
 [dependencies.sp-crypto-hashing-proc-macro]
-path = "../substrate/primitives/crypto/hashing/proc-macro"
 default-features = false
 optional = true
+path = "../substrate/primitives/crypto/hashing/proc-macro"
 
 [dependencies.sp-debug-derive]
-path = "../substrate/primitives/debug-derive"
 default-features = false
 optional = true
+path = "../substrate/primitives/debug-derive"
 
 [dependencies.sp-externalities]
-path = "../substrate/primitives/externalities"
 default-features = false
 optional = true
+path = "../substrate/primitives/externalities"
 
 [dependencies.sp-genesis-builder]
-path = "../substrate/primitives/genesis-builder"
 default-features = false
 optional = true
+path = "../substrate/primitives/genesis-builder"
 
 [dependencies.sp-inherents]
-path = "../substrate/primitives/inherents"
 default-features = false
 optional = true
+path = "../substrate/primitives/inherents"
 
 [dependencies.sp-io]
-path = "../substrate/primitives/io"
 default-features = false
 optional = true
+path = "../substrate/primitives/io"
 
 [dependencies.sp-keyring]
-path = "../substrate/primitives/keyring"
 default-features = false
 optional = true
+path = "../substrate/primitives/keyring"
 
 [dependencies.sp-keystore]
-path = "../substrate/primitives/keystore"
 default-features = false
 optional = true
+path = "../substrate/primitives/keystore"
 
 [dependencies.sp-metadata-ir]
-path = "../substrate/primitives/metadata-ir"
 default-features = false
 optional = true
+path = "../substrate/primitives/metadata-ir"
 
 [dependencies.sp-mixnet]
-path = "../substrate/primitives/mixnet"
 default-features = false
 optional = true
+path = "../substrate/primitives/mixnet"
 
 [dependencies.sp-mmr-primitives]
-path = "../substrate/primitives/merkle-mountain-range"
 default-features = false
 optional = true
+path = "../substrate/primitives/merkle-mountain-range"
 
 [dependencies.sp-npos-elections]
-path = "../substrate/primitives/npos-elections"
 default-features = false
 optional = true
+path = "../substrate/primitives/npos-elections"
 
 [dependencies.sp-offchain]
-path = "../substrate/primitives/offchain"
 default-features = false
 optional = true
+path = "../substrate/primitives/offchain"
 
 [dependencies.sp-runtime]
-path = "../substrate/primitives/runtime"
 default-features = false
 optional = true
+path = "../substrate/primitives/runtime"
 
 [dependencies.sp-runtime-interface]
-path = "../substrate/primitives/runtime-interface"
 default-features = false
 optional = true
+path = "../substrate/primitives/runtime-interface"
 
 [dependencies.sp-runtime-interface-proc-macro]
-path = "../substrate/primitives/runtime-interface/proc-macro"
 default-features = false
 optional = true
+path = "../substrate/primitives/runtime-interface/proc-macro"
 
 [dependencies.sp-session]
-path = "../substrate/primitives/session"
 default-features = false
 optional = true
+path = "../substrate/primitives/session"
 
 [dependencies.sp-staking]
-path = "../substrate/primitives/staking"
 default-features = false
 optional = true
+path = "../substrate/primitives/staking"
 
 [dependencies.sp-state-machine]
-path = "../substrate/primitives/state-machine"
 default-features = false
 optional = true
+path = "../substrate/primitives/state-machine"
 
 [dependencies.sp-statement-store]
-path = "../substrate/primitives/statement-store"
 default-features = false
 optional = true
+path = "../substrate/primitives/statement-store"
 
 [dependencies.sp-std]
-path = "../substrate/primitives/std"
 default-features = false
 optional = true
+path = "../substrate/primitives/std"
 
 [dependencies.sp-storage]
-path = "../substrate/primitives/storage"
 default-features = false
 optional = true
+path = "../substrate/primitives/storage"
 
 [dependencies.sp-timestamp]
-path = "../substrate/primitives/timestamp"
 default-features = false
 optional = true
+path = "../substrate/primitives/timestamp"
 
 [dependencies.sp-tracing]
-path = "../substrate/primitives/tracing"
 default-features = false
 optional = true
+path = "../substrate/primitives/tracing"
 
 [dependencies.sp-transaction-pool]
-path = "../substrate/primitives/transaction-pool"
 default-features = false
 optional = true
+path = "../substrate/primitives/transaction-pool"
 
 [dependencies.sp-transaction-storage-proof]
-path = "../substrate/primitives/transaction-storage-proof"
 default-features = false
 optional = true
+path = "../substrate/primitives/transaction-storage-proof"
 
 [dependencies.sp-trie]
-path = "../substrate/primitives/trie"
 default-features = false
 optional = true
+path = "../substrate/primitives/trie"
 
 [dependencies.sp-version]
-path = "../substrate/primitives/version"
 default-features = false
 optional = true
+path = "../substrate/primitives/version"
 
 [dependencies.sp-version-proc-macro]
-path = "../substrate/primitives/version/proc-macro"
 default-features = false
 optional = true
+path = "../substrate/primitives/version/proc-macro"
 
 [dependencies.sp-wasm-interface]
-path = "../substrate/primitives/wasm-interface"
 default-features = false
 optional = true
+path = "../substrate/primitives/wasm-interface"
 
 [dependencies.sp-weights]
-path = "../substrate/primitives/weights"
 default-features = false
 optional = true
+path = "../substrate/primitives/weights"
 
 [dependencies.staging-parachain-info]
-path = "../cumulus/parachains/pallets/parachain-info"
 default-features = false
 optional = true
+path = "../cumulus/parachains/pallets/parachain-info"
 
 [dependencies.staging-xcm]
-path = "../polkadot/xcm"
 default-features = false
 optional = true
+path = "../polkadot/xcm"
 
 [dependencies.staging-xcm-builder]
-path = "../polkadot/xcm/xcm-builder"
 default-features = false
 optional = true
+path = "../polkadot/xcm/xcm-builder"
 
 [dependencies.staging-xcm-executor]
-path = "../polkadot/xcm/xcm-executor"
 default-features = false
 optional = true
+path = "../polkadot/xcm/xcm-executor"
 
 [dependencies.substrate-bip39]
-path = "../substrate/utils/substrate-bip39"
 default-features = false
 optional = true
+path = "../substrate/utils/substrate-bip39"
 
 [dependencies.testnet-parachains-constants]
-path = "../cumulus/parachains/runtimes/constants"
 default-features = false
 optional = true
+path = "../cumulus/parachains/runtimes/constants"
 
 [dependencies.tracing-gum-proc-macro]
-path = "../polkadot/node/gum/proc-macro"
 default-features = false
 optional = true
+path = "../polkadot/node/gum/proc-macro"
 
 [dependencies.xcm-procedural]
-path = "../polkadot/xcm/procedural"
 default-features = false
 optional = true
+path = "../polkadot/xcm/procedural"
 
 [dependencies.xcm-runtime-apis]
-path = "../polkadot/xcm/xcm-runtime-apis"
 default-features = false
 optional = true
+path = "../polkadot/xcm/xcm-runtime-apis"
 
 [dependencies.asset-test-utils]
-path = "../cumulus/parachains/runtimes/assets/test-utils"
 default-features = false
 optional = true
+path = "../cumulus/parachains/runtimes/assets/test-utils"
 
 [dependencies.bridge-hub-test-utils]
-path = "../cumulus/parachains/runtimes/bridge-hubs/test-utils"
 default-features = false
 optional = true
+path = "../cumulus/parachains/runtimes/bridge-hubs/test-utils"
 
 [dependencies.cumulus-client-cli]
-path = "../cumulus/client/cli"
 default-features = false
 optional = true
+path = "../cumulus/client/cli"
 
 [dependencies.cumulus-client-collator]
-path = "../cumulus/client/collator"
 default-features = false
 optional = true
+path = "../cumulus/client/collator"
 
 [dependencies.cumulus-client-consensus-aura]
-path = "../cumulus/client/consensus/aura"
 default-features = false
 optional = true
+path = "../cumulus/client/consensus/aura"
 
 [dependencies.cumulus-client-consensus-common]
-path = "../cumulus/client/consensus/common"
 default-features = false
 optional = true
+path = "../cumulus/client/consensus/common"
 
 [dependencies.cumulus-client-consensus-proposer]
-path = "../cumulus/client/consensus/proposer"
 default-features = false
 optional = true
+path = "../cumulus/client/consensus/proposer"
 
 [dependencies.cumulus-client-consensus-relay-chain]
-path = "../cumulus/client/consensus/relay-chain"
 default-features = false
 optional = true
+path = "../cumulus/client/consensus/relay-chain"
 
 [dependencies.cumulus-client-network]
-path = "../cumulus/client/network"
 default-features = false
 optional = true
+path = "../cumulus/client/network"
 
 [dependencies.cumulus-client-parachain-inherent]
-path = "../cumulus/client/parachain-inherent"
 default-features = false
 optional = true
+path = "../cumulus/client/parachain-inherent"
 
 [dependencies.cumulus-client-pov-recovery]
-path = "../cumulus/client/pov-recovery"
 default-features = false
 optional = true
+path = "../cumulus/client/pov-recovery"
 
 [dependencies.cumulus-client-service]
-path = "../cumulus/client/service"
 default-features = false
 optional = true
+path = "../cumulus/client/service"
 
 [dependencies.cumulus-relay-chain-inprocess-interface]
-path = "../cumulus/client/relay-chain-inprocess-interface"
 default-features = false
 optional = true
+path = "../cumulus/client/relay-chain-inprocess-interface"
 
 [dependencies.cumulus-relay-chain-interface]
-path = "../cumulus/client/relay-chain-interface"
 default-features = false
 optional = true
+path = "../cumulus/client/relay-chain-interface"
 
 [dependencies.cumulus-relay-chain-minimal-node]
-path = "../cumulus/client/relay-chain-minimal-node"
 default-features = false
 optional = true
+path = "../cumulus/client/relay-chain-minimal-node"
 
 [dependencies.cumulus-relay-chain-rpc-interface]
-path = "../cumulus/client/relay-chain-rpc-interface"
 default-features = false
 optional = true
+path = "../cumulus/client/relay-chain-rpc-interface"
 
 [dependencies.cumulus-test-relay-sproof-builder]
-path = "../cumulus/test/relay-sproof-builder"
 default-features = false
 optional = true
+path = "../cumulus/test/relay-sproof-builder"
 
 [dependencies.emulated-integration-tests-common]
-path = "../cumulus/parachains/integration-tests/emulated/common"
 default-features = false
 optional = true
+path = "../cumulus/parachains/integration-tests/emulated/common"
 
 [dependencies.fork-tree]
-path = "../substrate/utils/fork-tree"
 default-features = false
 optional = true
+path = "../substrate/utils/fork-tree"
 
 [dependencies.frame-benchmarking-cli]
-path = "../substrate/utils/frame/benchmarking-cli"
 default-features = false
 optional = true
+path = "../substrate/utils/frame/benchmarking-cli"
 
 [dependencies.frame-remote-externalities]
-path = "../substrate/utils/frame/remote-externalities"
 default-features = false
 optional = true
+path = "../substrate/utils/frame/remote-externalities"
 
 [dependencies.frame-support-procedural-tools]
-path = "../substrate/frame/support/procedural/tools"
 default-features = false
 optional = true
+path = "../substrate/frame/support/procedural/tools"
 
 [dependencies.generate-bags]
-path = "../substrate/utils/frame/generate-bags"
 default-features = false
 optional = true
+path = "../substrate/utils/frame/generate-bags"
 
 [dependencies.mmr-gadget]
-path = "../substrate/client/merkle-mountain-range"
 default-features = false
 optional = true
+path = "../substrate/client/merkle-mountain-range"
 
 [dependencies.mmr-rpc]
-path = "../substrate/client/merkle-mountain-range/rpc"
 default-features = false
 optional = true
+path = "../substrate/client/merkle-mountain-range/rpc"
 
 [dependencies.pallet-contracts-mock-network]
-path = "../substrate/frame/contracts/mock-network"
 default-features = false
 optional = true
+path = "../substrate/frame/contracts/mock-network"
 
 [dependencies.pallet-revive-eth-rpc]
-path = "../substrate/frame/revive/rpc"
 default-features = false
 optional = true
+path = "../substrate/frame/revive/rpc"
 
 [dependencies.pallet-revive-mock-network]
-path = "../substrate/frame/revive/mock-network"
 default-features = false
 optional = true
+path = "../substrate/frame/revive/mock-network"
 
 [dependencies.pallet-transaction-payment-rpc]
-path = "../substrate/frame/transaction-payment/rpc"
 default-features = false
 optional = true
+path = "../substrate/frame/transaction-payment/rpc"
 
 [dependencies.parachains-runtimes-test-utils]
-path = "../cumulus/parachains/runtimes/test-utils"
 default-features = false
 optional = true
+path = "../cumulus/parachains/runtimes/test-utils"
 
 [dependencies.polkadot-approval-distribution]
-path = "../polkadot/node/network/approval-distribution"
 default-features = false
 optional = true
+path = "../polkadot/node/network/approval-distribution"
 
 [dependencies.polkadot-availability-bitfield-distribution]
-path = "../polkadot/node/network/bitfield-distribution"
 default-features = false
 optional = true
+path = "../polkadot/node/network/bitfield-distribution"
 
 [dependencies.polkadot-availability-distribution]
-path = "../polkadot/node/network/availability-distribution"
 default-features = false
 optional = true
+path = "../polkadot/node/network/availability-distribution"
 
 [dependencies.polkadot-availability-recovery]
-path = "../polkadot/node/network/availability-recovery"
 default-features = false
 optional = true
+path = "../polkadot/node/network/availability-recovery"
 
 [dependencies.polkadot-cli]
-path = "../polkadot/cli"
 default-features = false
 optional = true
+path = "../polkadot/cli"
 
 [dependencies.polkadot-collator-protocol]
-path = "../polkadot/node/network/collator-protocol"
 default-features = false
 optional = true
+path = "../polkadot/node/network/collator-protocol"
 
 [dependencies.polkadot-dispute-distribution]
-path = "../polkadot/node/network/dispute-distribution"
 default-features = false
 optional = true
+path = "../polkadot/node/network/dispute-distribution"
 
 [dependencies.polkadot-erasure-coding]
-path = "../polkadot/erasure-coding"
 default-features = false
 optional = true
+path = "../polkadot/erasure-coding"
 
 [dependencies.polkadot-gossip-support]
-path = "../polkadot/node/network/gossip-support"
 default-features = false
 optional = true
+path = "../polkadot/node/network/gossip-support"
 
 [dependencies.polkadot-network-bridge]
-path = "../polkadot/node/network/bridge"
 default-features = false
 optional = true
+path = "../polkadot/node/network/bridge"
 
 [dependencies.polkadot-node-collation-generation]
-path = "../polkadot/node/collation-generation"
 default-features = false
 optional = true
+path = "../polkadot/node/collation-generation"
 
 [dependencies.polkadot-node-core-approval-voting]
-path = "../polkadot/node/core/approval-voting"
 default-features = false
 optional = true
+path = "../polkadot/node/core/approval-voting"
 
 [dependencies.polkadot-node-core-approval-voting-parallel]
-path = "../polkadot/node/core/approval-voting-parallel"
 default-features = false
 optional = true
+path = "../polkadot/node/core/approval-voting-parallel"
 
 [dependencies.polkadot-node-core-av-store]
-path = "../polkadot/node/core/av-store"
 default-features = false
 optional = true
+path = "../polkadot/node/core/av-store"
 
 [dependencies.polkadot-node-core-backing]
-path = "../polkadot/node/core/backing"
 default-features = false
 optional = true
+path = "../polkadot/node/core/backing"
 
 [dependencies.polkadot-node-core-bitfield-signing]
-path = "../polkadot/node/core/bitfield-signing"
 default-features = false
 optional = true
+path = "../polkadot/node/core/bitfield-signing"
 
 [dependencies.polkadot-node-core-candidate-validation]
-path = "../polkadot/node/core/candidate-validation"
 default-features = false
 optional = true
+path = "../polkadot/node/core/candidate-validation"
 
 [dependencies.polkadot-node-core-chain-api]
-path = "../polkadot/node/core/chain-api"
 default-features = false
 optional = true
+path = "../polkadot/node/core/chain-api"
 
 [dependencies.polkadot-node-core-chain-selection]
-path = "../polkadot/node/core/chain-selection"
 default-features = false
 optional = true
+path = "../polkadot/node/core/chain-selection"
 
 [dependencies.polkadot-node-core-dispute-coordinator]
-path = "../polkadot/node/core/dispute-coordinator"
 default-features = false
 optional = true
+path = "../polkadot/node/core/dispute-coordinator"
 
 [dependencies.polkadot-node-core-parachains-inherent]
-path = "../polkadot/node/core/parachains-inherent"
 default-features = false
 optional = true
+path = "../polkadot/node/core/parachains-inherent"
 
 [dependencies.polkadot-node-core-prospective-parachains]
-path = "../polkadot/node/core/prospective-parachains"
 default-features = false
 optional = true
+path = "../polkadot/node/core/prospective-parachains"
 
 [dependencies.polkadot-node-core-provisioner]
-path = "../polkadot/node/core/provisioner"
 default-features = false
 optional = true
+path = "../polkadot/node/core/provisioner"
 
 [dependencies.polkadot-node-core-pvf]
-path = "../polkadot/node/core/pvf"
 default-features = false
 optional = true
+path = "../polkadot/node/core/pvf"
 
 [dependencies.polkadot-node-core-pvf-checker]
-path = "../polkadot/node/core/pvf-checker"
 default-features = false
 optional = true
+path = "../polkadot/node/core/pvf-checker"
 
 [dependencies.polkadot-node-core-pvf-common]
-path = "../polkadot/node/core/pvf/common"
 default-features = false
 optional = true
+path = "../polkadot/node/core/pvf/common"
 
 [dependencies.polkadot-node-core-pvf-execute-worker]
-path = "../polkadot/node/core/pvf/execute-worker"
 default-features = false
 optional = true
+path = "../polkadot/node/core/pvf/execute-worker"
 
 [dependencies.polkadot-node-core-pvf-prepare-worker]
-path = "../polkadot/node/core/pvf/prepare-worker"
 default-features = false
 optional = true
+path = "../polkadot/node/core/pvf/prepare-worker"
 
 [dependencies.polkadot-node-core-runtime-api]
-path = "../polkadot/node/core/runtime-api"
 default-features = false
 optional = true
+path = "../polkadot/node/core/runtime-api"
 
 [dependencies.polkadot-node-metrics]
-path = "../polkadot/node/metrics"
 default-features = false
 optional = true
+path = "../polkadot/node/metrics"
 
 [dependencies.polkadot-node-network-protocol]
-path = "../polkadot/node/network/protocol"
 default-features = false
 optional = true
+path = "../polkadot/node/network/protocol"
 
 [dependencies.polkadot-node-primitives]
-path = "../polkadot/node/primitives"
 default-features = false
 optional = true
+path = "../polkadot/node/primitives"
 
 [dependencies.polkadot-node-subsystem]
-path = "../polkadot/node/subsystem"
 default-features = false
 optional = true
+path = "../polkadot/node/subsystem"
 
 [dependencies.polkadot-node-subsystem-types]
-path = "../polkadot/node/subsystem-types"
 default-features = false
 optional = true
+path = "../polkadot/node/subsystem-types"
 
 [dependencies.polkadot-node-subsystem-util]
-path = "../polkadot/node/subsystem-util"
 default-features = false
 optional = true
+path = "../polkadot/node/subsystem-util"
 
 [dependencies.polkadot-omni-node-lib]
-path = "../cumulus/polkadot-omni-node/lib"
 default-features = false
 optional = true
+path = "../cumulus/polkadot-omni-node/lib"
 
 [dependencies.polkadot-overseer]
-path = "../polkadot/node/overseer"
 default-features = false
 optional = true
+path = "../polkadot/node/overseer"
 
 [dependencies.polkadot-rpc]
-path = "../polkadot/rpc"
 default-features = false
 optional = true
+path = "../polkadot/rpc"
 
 [dependencies.polkadot-service]
-path = "../polkadot/node/service"
 default-features = false
 optional = true
+path = "../polkadot/node/service"
 
 [dependencies.polkadot-statement-distribution]
-path = "../polkadot/node/network/statement-distribution"
 default-features = false
 optional = true
+path = "../polkadot/node/network/statement-distribution"
 
 [dependencies.polkadot-statement-table]
-path = "../polkadot/statement-table"
 default-features = false
 optional = true
+path = "../polkadot/statement-table"
 
 [dependencies.sc-allocator]
-path = "../substrate/client/allocator"
 default-features = false
 optional = true
+path = "../substrate/client/allocator"
 
 [dependencies.sc-authority-discovery]
-path = "../substrate/client/authority-discovery"
 default-features = false
 optional = true
+path = "../substrate/client/authority-discovery"
 
 [dependencies.sc-basic-authorship]
-path = "../substrate/client/basic-authorship"
 default-features = false
 optional = true
+path = "../substrate/client/basic-authorship"
 
 [dependencies.sc-block-builder]
-path = "../substrate/client/block-builder"
 default-features = false
 optional = true
+path = "../substrate/client/block-builder"
 
 [dependencies.sc-chain-spec]
-path = "../substrate/client/chain-spec"
 default-features = false
 optional = true
+path = "../substrate/client/chain-spec"
 
 [dependencies.sc-cli]
-path = "../substrate/client/cli"
 default-features = false
 optional = true
+path = "../substrate/client/cli"
 
 [dependencies.sc-client-api]
-path = "../substrate/client/api"
 default-features = false
 optional = true
+path = "../substrate/client/api"
 
 [dependencies.sc-client-db]
-path = "../substrate/client/db"
 default-features = false
 optional = true
+path = "../substrate/client/db"
 
 [dependencies.sc-consensus]
-path = "../substrate/client/consensus/common"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/common"
 
 [dependencies.sc-consensus-aura]
-path = "../substrate/client/consensus/aura"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/aura"
 
 [dependencies.sc-consensus-babe]
-path = "../substrate/client/consensus/babe"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/babe"
 
 [dependencies.sc-consensus-babe-rpc]
-path = "../substrate/client/consensus/babe/rpc"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/babe/rpc"
 
 [dependencies.sc-consensus-beefy]
-path = "../substrate/client/consensus/beefy"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/beefy"
 
 [dependencies.sc-consensus-beefy-rpc]
-path = "../substrate/client/consensus/beefy/rpc"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/beefy/rpc"
 
 [dependencies.sc-consensus-epochs]
-path = "../substrate/client/consensus/epochs"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/epochs"
 
 [dependencies.sc-consensus-grandpa]
-path = "../substrate/client/consensus/grandpa"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/grandpa"
 
 [dependencies.sc-consensus-grandpa-rpc]
-path = "../substrate/client/consensus/grandpa/rpc"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/grandpa/rpc"
 
 [dependencies.sc-consensus-manual-seal]
-path = "../substrate/client/consensus/manual-seal"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/manual-seal"
 
 [dependencies.sc-consensus-pow]
-path = "../substrate/client/consensus/pow"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/pow"
 
 [dependencies.sc-consensus-slots]
-path = "../substrate/client/consensus/slots"
 default-features = false
 optional = true
+path = "../substrate/client/consensus/slots"
 
 [dependencies.sc-executor]
-path = "../substrate/client/executor"
 default-features = false
 optional = true
+path = "../substrate/client/executor"
 
 [dependencies.sc-executor-common]
-path = "../substrate/client/executor/common"
 default-features = false
 optional = true
+path = "../substrate/client/executor/common"
 
 [dependencies.sc-executor-polkavm]
-path = "../substrate/client/executor/polkavm"
 default-features = false
 optional = true
+path = "../substrate/client/executor/polkavm"
 
 [dependencies.sc-executor-wasmtime]
-path = "../substrate/client/executor/wasmtime"
 default-features = false
 optional = true
+path = "../substrate/client/executor/wasmtime"
 
 [dependencies.sc-informant]
-path = "../substrate/client/informant"
 default-features = false
 optional = true
+path = "../substrate/client/informant"
 
 [dependencies.sc-keystore]
-path = "../substrate/client/keystore"
 default-features = false
 optional = true
+path = "../substrate/client/keystore"
 
 [dependencies.sc-mixnet]
-path = "../substrate/client/mixnet"
 default-features = false
 optional = true
+path = "../substrate/client/mixnet"
 
 [dependencies.sc-network]
-path = "../substrate/client/network"
 default-features = false
 optional = true
+path = "../substrate/client/network"
 
 [dependencies.sc-network-common]
-path = "../substrate/client/network/common"
 default-features = false
 optional = true
+path = "../substrate/client/network/common"
 
 [dependencies.sc-network-gossip]
-path = "../substrate/client/network-gossip"
 default-features = false
 optional = true
+path = "../substrate/client/network-gossip"
 
 [dependencies.sc-network-light]
-path = "../substrate/client/network/light"
 default-features = false
 optional = true
+path = "../substrate/client/network/light"
 
 [dependencies.sc-network-statement]
-path = "../substrate/client/network/statement"
 default-features = false
 optional = true
+path = "../substrate/client/network/statement"
 
 [dependencies.sc-network-sync]
-path = "../substrate/client/network/sync"
 default-features = false
 optional = true
+path = "../substrate/client/network/sync"
 
 [dependencies.sc-network-transactions]
-path = "../substrate/client/network/transactions"
 default-features = false
 optional = true
+path = "../substrate/client/network/transactions"
 
 [dependencies.sc-network-types]
-path = "../substrate/client/network/types"
 default-features = false
 optional = true
+path = "../substrate/client/network/types"
 
 [dependencies.sc-offchain]
-path = "../substrate/client/offchain"
 default-features = false
 optional = true
+path = "../substrate/client/offchain"
 
 [dependencies.sc-proposer-metrics]
-path = "../substrate/client/proposer-metrics"
 default-features = false
 optional = true
+path = "../substrate/client/proposer-metrics"
 
 [dependencies.sc-rpc]
-path = "../substrate/client/rpc"
 default-features = false
 optional = true
+path = "../substrate/client/rpc"
 
 [dependencies.sc-rpc-api]
-path = "../substrate/client/rpc-api"
 default-features = false
 optional = true
+path = "../substrate/client/rpc-api"
 
 [dependencies.sc-rpc-server]
-path = "../substrate/client/rpc-servers"
 default-features = false
 optional = true
+path = "../substrate/client/rpc-servers"
 
 [dependencies.sc-rpc-spec-v2]
-path = "../substrate/client/rpc-spec-v2"
 default-features = false
 optional = true
+path = "../substrate/client/rpc-spec-v2"
 
 [dependencies.sc-runtime-utilities]
-path = "../substrate/client/runtime-utilities"
 default-features = false
 optional = true
+path = "../substrate/client/runtime-utilities"
 
 [dependencies.sc-service]
-path = "../substrate/client/service"
 default-features = false
 optional = true
+path = "../substrate/client/service"
 
 [dependencies.sc-state-db]
-path = "../substrate/client/state-db"
 default-features = false
 optional = true
+path = "../substrate/client/state-db"
 
 [dependencies.sc-statement-store]
-path = "../substrate/client/statement-store"
 default-features = false
 optional = true
+path = "../substrate/client/statement-store"
 
 [dependencies.sc-storage-monitor]
-path = "../substrate/client/storage-monitor"
 default-features = false
 optional = true
+path = "../substrate/client/storage-monitor"
 
 [dependencies.sc-sync-state-rpc]
-path = "../substrate/client/sync-state-rpc"
 default-features = false
 optional = true
+path = "../substrate/client/sync-state-rpc"
 
 [dependencies.sc-sysinfo]
-path = "../substrate/client/sysinfo"
 default-features = false
 optional = true
+path = "../substrate/client/sysinfo"
 
 [dependencies.sc-telemetry]
-path = "../substrate/client/telemetry"
 default-features = false
 optional = true
+path = "../substrate/client/telemetry"
 
 [dependencies.sc-tracing]
-path = "../substrate/client/tracing"
 default-features = false
 optional = true
+path = "../substrate/client/tracing"
 
 [dependencies.sc-transaction-pool]
-path = "../substrate/client/transaction-pool"
 default-features = false
 optional = true
+path = "../substrate/client/transaction-pool"
 
 [dependencies.sc-transaction-pool-api]
-path = "../substrate/client/transaction-pool/api"
 default-features = false
 optional = true
+path = "../substrate/client/transaction-pool/api"
 
 [dependencies.sc-utils]
-path = "../substrate/client/utils"
 default-features = false
 optional = true
+path = "../substrate/client/utils"
 
 [dependencies.snowbridge-runtime-test-common]
-path = "../bridges/snowbridge/runtime/test-common"
 default-features = false
 optional = true
+path = "../bridges/snowbridge/runtime/test-common"
 
 [dependencies.sp-blockchain]
-path = "../substrate/primitives/blockchain"
 default-features = false
 optional = true
+path = "../substrate/primitives/blockchain"
 
 [dependencies.sp-consensus]
-path = "../substrate/primitives/consensus/common"
 default-features = false
 optional = true
+path = "../substrate/primitives/consensus/common"
 
 [dependencies.sp-core-hashing]
-path = "../substrate/deprecated/hashing"
 default-features = false
 optional = true
+path = "../substrate/deprecated/hashing"
 
 [dependencies.sp-core-hashing-proc-macro]
-path = "../substrate/deprecated/hashing/proc-macro"
 default-features = false
 optional = true
+path = "../substrate/deprecated/hashing/proc-macro"
 
 [dependencies.sp-database]
-path = "../substrate/primitives/database"
 default-features = false
 optional = true
+path = "../substrate/primitives/database"
 
 [dependencies.sp-maybe-compressed-blob]
-path = "../substrate/primitives/maybe-compressed-blob"
 default-features = false
 optional = true
+path = "../substrate/primitives/maybe-compressed-blob"
 
 [dependencies.sp-panic-handler]
-path = "../substrate/primitives/panic-handler"
 default-features = false
 optional = true
+path = "../substrate/primitives/panic-handler"
 
 [dependencies.sp-rpc]
-path = "../substrate/primitives/rpc"
 default-features = false
 optional = true
+path = "../substrate/primitives/rpc"
 
 [dependencies.staging-chain-spec-builder]
-path = "../substrate/bin/utils/chain-spec-builder"
 default-features = false
 optional = true
+path = "../substrate/bin/utils/chain-spec-builder"
 
 [dependencies.staging-node-inspect]
-path = "../substrate/bin/node/inspect"
 default-features = false
 optional = true
+path = "../substrate/bin/node/inspect"
 
 [dependencies.staging-tracking-allocator]
-path = "../polkadot/node/tracking-allocator"
 default-features = false
 optional = true
+path = "../polkadot/node/tracking-allocator"
 
 [dependencies.subkey]
-path = "../substrate/bin/utils/subkey"
 default-features = false
 optional = true
+path = "../substrate/bin/utils/subkey"
 
 [dependencies.substrate-build-script-utils]
-path = "../substrate/utils/build-script-utils"
 default-features = false
 optional = true
+path = "../substrate/utils/build-script-utils"
 
 [dependencies.substrate-frame-rpc-support]
-path = "../substrate/utils/frame/rpc/support"
 default-features = false
 optional = true
+path = "../substrate/utils/frame/rpc/support"
 
 [dependencies.substrate-frame-rpc-system]
-path = "../substrate/utils/frame/rpc/system"
 default-features = false
 optional = true
+path = "../substrate/utils/frame/rpc/system"
 
 [dependencies.substrate-prometheus-endpoint]
-path = "../substrate/utils/prometheus"
 default-features = false
 optional = true
+path = "../substrate/utils/prometheus"
 
 [dependencies.substrate-rpc-client]
-path = "../substrate/utils/frame/rpc/client"
 default-features = false
 optional = true
+path = "../substrate/utils/frame/rpc/client"
 
 [dependencies.substrate-state-trie-migration-rpc]
-path = "../substrate/utils/frame/rpc/state-trie-migration-rpc"
 default-features = false
 optional = true
+path = "../substrate/utils/frame/rpc/state-trie-migration-rpc"
 
 [dependencies.substrate-wasm-builder]
-path = "../substrate/utils/wasm-builder"
 default-features = false
 optional = true
+path = "../substrate/utils/wasm-builder"
 
 [dependencies.tracing-gum]
-path = "../polkadot/node/gum"
 default-features = false
 optional = true
+path = "../polkadot/node/gum"
 
 [dependencies.xcm-emulator]
-path = "../cumulus/xcm/xcm-emulator"
 default-features = false
 optional = true
+path = "../cumulus/xcm/xcm-emulator"
 
 [dependencies.xcm-simulator]
-path = "../polkadot/xcm/xcm-simulator"
 default-features = false
 optional = true
+path = "../polkadot/xcm/xcm-simulator"
 
 [package.metadata.docs.rs]
 features = ["node", "runtime-full"]