migrate to umbrella crate

polytope-labs · Dec 19, 2024 · c433788 · c433788
1 parent a72c2cb
commit c433788
Show file tree

Hide file tree

Showing 59 changed files with 537 additions and 762 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,150 +22,14 @@ members = [
 [workspace.dependencies]
 codec = { version = "3.1.3", package = "parity-scale-codec", default-features = false }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+jsonrpsee = "0.24"
+try-runtime-cli = "0.41.0"
+polkadot-sdk = { version = "0.7.0", default-features = false }
 
-# wasm
-frame-benchmarking = { version = "38.0.0", default-features = false }
-frame-executive = { version = "38.0.0", default-features = false }
-frame-election-provider-support = { version = "38.0.0", default-features = false }
-frame-support = { version = "38.0.0", default-features = false }
-frame-system = { version = "38.0.0", default-features = false }
-frame-system-benchmarking = { version = "38.0.0", default-features = false }
-frame-system-rpc-runtime-api = { version = "34.0.0", default-features = false }
-frame-try-runtime = { version = "0.44.0", default-features = false }
-pallet-aura = { version = "37.0.0", default-features = false }
-pallet-grandpa = { version = "38.0.0", default-features = false }
-pallet-babe = { version = "38.0.0", default-features = false }
-pallet-offences = { version = "37.0.0", default-features = false }
-pallet-authorship = { version = "38.0.0", default-features = false }
-pallet-balances = { version = "39.0.0", default-features = false }
-pallet-session = { version = "38.0.0", default-features = false }
-pallet-staking = { version = "38.0.0", default-features = false }
-pallet-session-benchmarking = { version = "38.0.0", default-features = false }
-pallet-sudo = { version = "38.0.0", default-features = false }
-pallet-timestamp = { version = "37.0.0", default-features = false }
-pallet-transaction-payment = { version = "38.0.0", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { version = "38.0.0", default-features = false }
-pallet-message-queue = { version = "41.0.2", default-features = false }
-pallet-beefy-mmr = { version = "39.0.0", default-features = false }
-pallet-assets = { version = "40.0.0", default-features = false }
-pallet-staking-reward-curve = { version = "12.0.0" }
-
-sp-api = { version = "34.0.0", default-features = false }
-sp-blockchain = { version = "37.0.1", default-features = false }
-sp-io = { version = "38.0.0", default-features = false }
-sp-trie = { version = "37.0.0", default-features = false }
-sp-block-builder = { version = "34.0.0", default-features = false }
-sp-consensus-aura = { version = "0.40.0", default-features = false }
-sp-consensus-babe = { version = "0.40.0", default-features = false }
-sp-consensus-grandpa = { version = "21.0.0", default-features = false }
-sp-consensus-slots = { version = "0.40.1", default-features = false }
-sp-consensus = { version = "0.40.0", default-features = false }
-sp-consensus-beefy = { version = "22.1.0", default-features = false }
+# crates which cannot be used from polkadot-sdk
 sp-core = { version = "34.0.0", default-features = false }
-sp-inherents = { version = "34.0.0", default-features = false }
-sp-externalities = { version = "0.29.0", default-features = false }
-sp-offchain = { version = "34.0.0", default-features = false }
-sp-keyring = { version = "39.0.0", default-features = false }
-sp-runtime = { version = "39.0.1", default-features = false }
 sp-runtime-interface = { version = "28.0.0", default-features = false }
-sp-timestamp = { version = "34.0.0", default-features = false }
-sp-keystore = { version = "0.40.0", default-features = false }
-sp-mmr-primitives = { version = "34.1.0", default-features = false }
-sp-state-machine = { version = "0.43.0", default-features = false }
-sp-storage = { version = "21.0.0", default-features = false }
-sp-staking = { version = "36.0.0", default-features = false }
-sp-session = { version = "36.0.0", default-features = false }
-sp-std = { version = "14.0.0", default-features = false }
-sp-transaction-pool = { version = "34.0.0", default-features = false }
-sp-version = { version = "37.0.0", default-features = false }
-sp-genesis-builder = { version = "0.15.1", default-features = false }
-sp-wasm-interface = { version = "21.0.1", default-features = false }
-sp-transaction-storage-proof = { version = "34.0.0", default-features = false }
-
-pallet-xcm = { version = "17.0.1", default-features = false }
-polkadot-parachain-primitives = { version = "14.0.0", default-features = false }
-polkadot-runtime-common = { version = "17.0.0", default-features = false }
-staging-xcm = { version = "14.2.0", default-features = false }
-staging-xcm-builder = { version = "17.0.1", default-features = false }
-staging-xcm-executor = { version = "17.0.0", default-features = false }
-
-cumulus-primitives-aura = { version = "0.15.0", default-features = false }
-cumulus-pallet-session-benchmarking = { version = "19.0.0", default-features = false }
-cumulus-pallet-aura-ext = { version = "0.17.0", default-features = false }
-cumulus-pallet-dmp-queue = { version = "0.17.0", default-features = false }
 cumulus-pallet-parachain-system = { version = "0.17.1", default-features = false }
-cumulus-pallet-xcm = { version = "0.17.0", default-features = false }
-cumulus-pallet-xcmp-queue = { version = "0.17.0", default-features = false }
-cumulus-primitives-core = { version = "0.16.0", default-features = false }
-
-cumulus-primitives-timestamp = { version = "0.16.0", default-features = false }
-cumulus-primitives-utility = { version = "0.17.0", default-features = false }
-pallet-collator-selection = { version = "19.0.0", default-features = false }
-parachain-info = { version = "0.17.0", package = "staging-parachain-info", default-features = false }
-parachains-common = { version = "18.0.0", default-features = false }
-
-
-# client
-parachain-inherent = { version = "0.16.0", package = "cumulus-primitives-parachain-inherent" }
-sproof-builder = { version = "0.16.0", package = "cumulus-test-relay-sproof-builder" }
-frame-benchmarking-cli = "43.0.0"
-
-pallet-transaction-payment-rpc = "41.0.0"
-sc-basic-authorship = "0.45.0"
-
-sc-chain-spec = "38.0.0"
-sc-cli = "0.47.0"
-sc-keystore = "33.0.0"
-sc-informant = "0.44.0"
-sc-block-builder = "0.42.0"
-sc-client-api = "37.0.0"
-sc-client-db = "0.44.1"
-sc-consensus = "0.44.0"
-sc-consensus-aura = "0.45.0"
-sc-consensus-grandpa = "0.30.0"
-sc-consensus-babe = "0.45.0"
-sc-consensus-epochs = "0.44.0"
-sc-consensus-slots = "0.44.0"
-sc-executor = "0.40.1"
-sc-network = "0.45.1"
-sc-network-sync = "0.44.1"
-sc-network-common = "0.44.0"
-sc-rpc = "40.0.0"
-sc-rpc-api = "0.44.0"
-sc-rpc-server = "17.1.0"
-sc-rpc-spec-v2 = "0.45.0"
-substrate-state-trie-migration-rpc = "38.0.0"
-sc-consensus-babe-rpc = "0.45.0"
-sc-consensus-grandpa-rpc = "0.30.0"
-sc-sync-state-rpc = "0.45.0"
+substrate-wasm-builder = "24.0.1"
 sc-service = "0.46.0"
-sc-sysinfo = "38.0.0"
-sc-storage-monitor = "0.22.0"
-sc-telemetry = "25.0.0"
 sc-tracing = "37.0.1"
-sc-transaction-pool = "37.0.0"
-sc-transaction-pool-api = "37.0.0"
-sc-offchain = "40.0.0"
-manual-seal = { version = "0.46.0", package = "sc-consensus-manual-seal" }
-substrate-frame-rpc-system = "39.0.0"
-substrate-prometheus-endpoint = "0.17.0"
-try-runtime-cli = "0.41.0"
-polkadot-cli = "19.0.0"
-polkadot-primitives = "16.0.0"
-polkadot-service = "19.0.0"
-cumulus-client-cli = "0.18.0"
-cumulus-client-consensus-aura = "0.18.0"
-cumulus-client-consensus-common = "0.18.0"
-cumulus-client-network = "0.18.0"
-cumulus-client-service = "0.19.0"
-cumulus-primitives-parachain-inherent = "0.16.0"
-cumulus-relay-chain-interface = "0.18.0"
-cumulus-client-consensus-proposer = "0.16.0"
-cumulus-client-collator = "0.18.0"
-substrate-wasm-builder = { version = "24.0.1" }
-mmr-rpc = { version = "38.0.0" }
-xcm-simulator-example = "17.0.0"
-xcm-simulator = "17.0.0"
-polkadot-runtime-parachains = "17.0.1"
-substrate-build-script-utils = "11.0.0"
-jsonrpsee = "0.24"
diff --git a/examples/aura/node/Cargo.toml b/examples/aura/node/Cargo.toml
@@ -19,66 +19,67 @@ name = "aura-node"
 [dependencies]
 clap = { version = "4.0.9", features = ["derive"] }
 futures = { version = "0.3.21", features = ["thread-pool"] }
-
-sc-cli = { workspace = true }
-sp-core = { workspace = true }
-sc-executor = { workspace = true }
-sc-service = { workspace = true }
-sc-network = { workspace = true }
-sc-offchain = { workspace = true }
-sc-telemetry = { workspace = true }
-sc-keystore = { workspace = true }
-sc-transaction-pool = { workspace = true }
-sc-transaction-pool-api = { workspace = true }
-sc-consensus-aura = { workspace = true }
-sp-consensus-aura = { workspace = true }
-sp-consensus = { workspace = true }
-sc-consensus = { workspace = true }
-sc-consensus-grandpa = { workspace = true }
-sp-consensus-grandpa = { workspace = true }
-sc-client-api = { workspace = true }
-sp-runtime = { workspace = true }
-sp-io = { workspace = true, default-features = true }
-sp-timestamp = { workspace = true }
-sp-inherents = { workspace = true }
-sp-keyring = { workspace = true }
-frame-system = { workspace = true }
-pallet-transaction-payment = { default-features = false, workspace = true }
-
-# These dependencies are used for the node template's RPCs
 jsonrpsee = { workspace = true, features = ["server"] }
-sc-rpc = { workspace = true }
-sp-api = { workspace = true }
-sc-rpc-api = { workspace = true }
-sp-blockchain = { workspace = true }
-sp-block-builder = { workspace = true }
-sc-basic-authorship = { workspace = true }
-substrate-frame-rpc-system = { workspace = true }
-pallet-transaction-payment-rpc = { workspace = true }
-
-# These dependencies are used for runtime benchmarking
-frame-benchmarking = { workspace = true }
-frame-benchmarking-cli = { workspace = true }
+try-runtime-cli = { optional = true, workspace = true }
+serde_json = "1.0"
 
-# Local Dependencies
 aura-runtime = { path = "../runtime" }
 sc-simnode = { path = "../../../simnode", features = ["aura"] }
 
-# CLI-specific dependencies
-try-runtime-cli = { optional = true, workspace = true }
-serde_json = "1.0"
+[dependencies.polkadot-sdk]
+workspace = true
+default-features = false
+features = [
+    "sp-io",
+    "sc-cli",
+    "sp-core",
+    "sc-executor",
+    "sc-service",
+    "sc-network",
+    "sc-offchain",
+    "sc-telemetry",
+    "sc-keystore",
+    "sc-transaction-pool",
+    "sc-transaction-pool-api",
+    "sc-consensus-aura",
+    "sp-consensus-aura",
+    "sp-consensus",
+    "sc-consensus",
+    "sc-consensus-grandpa",
+    "sp-consensus-grandpa",
+    "sc-client-api",
+    "sp-runtime",
+    "sp-timestamp",
+    "sp-inherents",
+    "sp-keyring",
+    "frame-system",
+    "sc-rpc",
+    "sp-api",
+    "sc-rpc-api",
+    "sp-blockchain",
+    "sp-block-builder",
+    "sc-basic-authorship",
+    "substrate-frame-rpc-system",
+    "pallet-transaction-payment",
+    "pallet-transaction-payment-rpc",
+    "frame-benchmarking",
+    "frame-benchmarking-cli",
+]
 
 [build-dependencies]
-substrate-build-script-utils = { workspace = true }
+polkadot-sdk = { workspace = true, default-features = true, features = ["substrate-build-script-utils"] }
 
 [features]
 default = []
 # Dependencies that are only required if runtime benchmarking should be build.
 runtime-benchmarks = [
 	"aura-runtime/runtime-benchmarks",
-	"frame-benchmarking/runtime-benchmarks",
-	"frame-benchmarking-cli/runtime-benchmarks",
+	"polkadot-sdk/runtime-benchmarks",
 ]
 # Enable features that allow the runtime to be tried and debugged. Name might be subject to change
 # in the near future.
-try-runtime = ["aura-runtime/try-runtime", "try-runtime-cli/try-runtime"]
+try-runtime = [
+    "aura-runtime/try-runtime",
+    "polkadot-sdk/try-runtime",
+    "try-runtime-cli/try-runtime"
+]
diff --git a/examples/aura/node/build.rs b/examples/aura/node/build.rs
@@ -1,4 +1,4 @@
-use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};
+use polkadot_sdk::substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};
 
 fn main() {
 	generate_cargo_keys();

diff --git a/examples/aura/node/src/benchmarking.rs b/examples/aura/node/src/benchmarking.rs
@@ -2,6 +2,8 @@
 //!
 //! Should only be used for benchmarking as it may break in other contexts.
 
+use polkadot_sdk::*;
+
 use crate::service::FullClient;
 
 use aura_runtime as runtime;

diff --git a/examples/aura/node/src/chain_spec.rs b/examples/aura/node/src/chain_spec.rs
@@ -1,3 +1,5 @@
+use polkadot_sdk::*;
+
 use aura_runtime::{AccountId, Signature, WASM_BINARY};
 use sc_service::ChainType;
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;

diff --git a/examples/aura/node/src/cli.rs b/examples/aura/node/src/cli.rs
@@ -1,3 +1,5 @@
+use polkadot_sdk::*;
+
 use sc_cli::RunCmd;
 
 #[derive(Debug, clap::Parser)]

diff --git a/examples/aura/node/src/command.rs b/examples/aura/node/src/command.rs
@@ -1,3 +1,5 @@
+use polkadot_sdk::*;
+
 use crate::{
 	benchmarking::{inherent_benchmark_data, RemarkBuilder, TransferKeepAliveBuilder},
 	chain_spec,

diff --git a/examples/aura/node/src/main.rs b/examples/aura/node/src/main.rs
@@ -1,6 +1,8 @@
 //! Substrate Node Template CLI library.
 #![warn(missing_docs)]
 
+use polkadot_sdk::*;
+
 mod chain_spec;
 #[macro_use]
 mod service;

diff --git a/examples/aura/node/src/rpc.rs b/examples/aura/node/src/rpc.rs
@@ -4,6 +4,7 @@
 //! capabilities that are specific to this project's runtime configuration.
 
 #![warn(missing_docs)]
+use polkadot_sdk::*;
 
 use std::sync::Arc;
 

diff --git a/examples/aura/node/src/service.rs b/examples/aura/node/src/service.rs
@@ -1,5 +1,7 @@
 //! Service and ServiceFactory implementation. Specialized wrapper over substrate service.
 
+use polkadot_sdk::*;
+
 use aura_runtime::{self, opaque::Block, RuntimeApi};
 use futures::FutureExt;
 use sc_client_api::{Backend, BlockBackend};