Use umbrella crate for minimal template

templates/minimal/node/Cargo.toml

@@ -21,36 +21,7 @@ futures-timer = { workspace = true }
 jsonrpsee = { features = ["server"], workspace = true }
 serde_json = { workspace = true, default-features = true }
 
-sc-cli = { workspace = true, default-features = true }
-sc-executor = { 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-transaction-pool = { workspace = true, default-features = true }
-sc-transaction-pool-api = { workspace = true, default-features = true }
-sc-consensus = { workspace = true, default-features = true }
-sc-consensus-manual-seal = { workspace = true, default-features = true }
-sc-rpc-api = { workspace = true, default-features = true }
-sc-basic-authorship = { workspace = true, default-features = true }
-sc-offchain = { workspace = true, default-features = true }
-sc-client-api = { workspace = true, default-features = true }
-
-sp-timestamp = { 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-io = { workspace = true, default-features = true }
-sp-runtime = { workspace = true, default-features = true }
-
-substrate-frame-rpc-system = { workspace = true, default-features = true }
-
-# Once the native runtime is gone, there should be little to no dependency on FRAME here, and
-# certainly no dependency on the runtime.
-frame = { features = [
-	"experimental",
-	"runtime",
-], workspace = true, default-features = true }
+polkadot-sdk = { workspace = true, features = ["node"] }
 minimal-template-runtime = { workspace = true }
 
 [build-dependencies]

templates/minimal/node/src/chain_spec.rs

@@ -16,9 +16,12 @@
 // limitations under the License.
 
 use minimal_template_runtime::{BalancesConfig, SudoConfig, WASM_BINARY};
-use sc_service::{ChainType, Properties};
+use polkadot_sdk::{
+	sc_service::{ChainType, Properties},
+	sp_keyring::AccountKeyring,
+	*,
+};
 use serde_json::{json, Value};
-use sp_keyring::AccountKeyring;
 
 /// This is a specialization of the general Substrate ChainSpec type.
 pub type ChainSpec = sc_service::GenericChainSpec;

templates/minimal/node/src/cli.rs

@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use sc_cli::RunCmd;
+use polkadot_sdk::{sc_cli::RunCmd, *};
 
 #[derive(Debug, Clone)]
 pub enum Consensus {

templates/minimal/node/src/command.rs

@@ -20,8 +20,7 @@ use crate::{
 	cli::{Cli, Subcommand},
 	service,
 };
-use sc_cli::SubstrateCli;
-use sc_service::PartialComponents;
+use polkadot_sdk::{sc_cli::SubstrateCli, sc_service::PartialComponents, *};
 
 #[cfg(feature = "try-runtime")]
 use try_runtime_cli::block_building_info::timestamp_with_aura_info;

templates/minimal/node/src/main.rs

@@ -24,6 +24,6 @@ mod command;
 mod rpc;
 mod service;
 
-fn main() -> sc_cli::Result<()> {
+fn main() -> polkadot_sdk::sc_cli::Result<()> {
 	command::run()
 }

templates/minimal/node/src/rpc.rs

@@ -24,11 +24,14 @@
 
 use jsonrpsee::RpcModule;
 use minimal_template_runtime::interface::{AccountId, Nonce, OpaqueBlock};
-use sc_transaction_pool_api::TransactionPool;
-use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
+use polkadot_sdk::{
+	sc_transaction_pool_api::TransactionPool,
+	sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata},
+	*,
+};
 use std::sync::Arc;
 
-pub use sc_rpc_api::DenyUnsafe;
+pub use polkadot_sdk::sc_rpc_api::DenyUnsafe;
 
 /// Full client dependencies.
 pub struct FullDeps<C, P> {
@@ -57,7 +60,7 @@ where
 	C::Api: substrate_frame_rpc_system::AccountNonceApi<OpaqueBlock, AccountId, Nonce>,
 	P: TransactionPool + 'static,
 {
-	use substrate_frame_rpc_system::{System, SystemApiServer};
+	use polkadot_sdk::substrate_frame_rpc_system::{System, SystemApiServer};
 	let mut module = RpcModule::new(());
 	let FullDeps { client, pool, deny_unsafe } = deps;
 

templates/minimal/node/src/service.rs

@@ -17,12 +17,15 @@
 
 use futures::FutureExt;
 use minimal_template_runtime::{interface::OpaqueBlock as Block, RuntimeApi};
-use sc_client_api::backend::Backend;
-use sc_executor::WasmExecutor;
-use sc_service::{error::Error as ServiceError, Configuration, TaskManager};
-use sc_telemetry::{Telemetry, TelemetryWorker};
-use sc_transaction_pool_api::OffchainTransactionPoolFactory;
-use sp_runtime::traits::Block as BlockT;
+use polkadot_sdk::{
+	sc_client_api::backend::Backend,
+	sc_executor::WasmExecutor,
+	sc_service::{error::Error as ServiceError, Configuration, TaskManager},
+	sc_telemetry::{Telemetry, TelemetryWorker},
+	sc_transaction_pool_api::OffchainTransactionPoolFactory,
+	sp_runtime::traits::Block as BlockT,
+	*,
+};
 use std::sync::Arc;
 
 use crate::cli::Consensus;

templates/minimal/pallets/template/Cargo.toml

@@ -13,18 +13,11 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { features = [
-	"derive",
-], workspace = true }
-scale-info = { features = [
-	"derive",
-], workspace = true }
-frame = { features = [
-	"experimental",
-	"runtime",
-], workspace = true }
+codec = { features = ["derive"], workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+polkadot-sdk = { workspace = true, default-features = false, features = ["runtime", "experimental"] }
 
 
 [features]
 default = ["std"]
-std = ["codec/std", "frame/std", "scale-info/std"]
+std = ["codec/std", "polkadot-sdk/std", "scale-info/std"]

templates/minimal/pallets/template/src/lib.rs

@@ -5,7 +5,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use frame::prelude::*;
+use polkadot_sdk::{polkadot_sdk_frame as frame, polkadot_sdk_frame::prelude::*};
 
 // Re-export all pallet parts, this is needed to properly import the pallet into the runtime.
 pub use pallet::*;
@@ -15,6 +15,7 @@ pub mod pallet {
 	use super::*;
 
 	#[pallet::config]
+	#[pallet::disable_frame_system_supertrait_check]
 	pub trait Config: frame_system::Config {}
 
 	#[pallet::pallet]

templates/minimal/runtime/Cargo.toml

@@ -12,47 +12,19 @@ publish = false
 [dependencies]
 codec = { workspace = true }
 scale-info = { workspace = true }
-
-# this is a frame-based runtime, thus importing `frame` with runtime feature enabled.
-frame = { features = [
-	"experimental",
-	"runtime",
-], workspace = true }
-
-# pallets that we want to use
-pallet-balances = { workspace = true }
-pallet-sudo = { workspace = true }
-pallet-timestamp = { workspace = true }
-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 }
+polkadot-sdk = { workspace = true, features = ["runtime"] }
 
 # local pallet templates
 pallet-minimal-template = { workspace = true }
 
 [build-dependencies]
-substrate-wasm-builder = { optional = true, workspace = true, default-features = true }
+polkadot-sdk = { optional = true, workspace = true, features = ["substrate-wasm-builder"] }
 
 [features]
 default = ["std"]
 std = [
 	"codec/std",
 	"scale-info/std",
-
-	"frame/std",
-
-	"pallet-balances/std",
-	"pallet-sudo/std",
-	"pallet-timestamp/std",
-	"pallet-transaction-payment-rpc-runtime-api/std",
-	"pallet-transaction-payment/std",
-
+	"polkadot-sdk/std",
 	"pallet-minimal-template/std",
-
-	"sp-genesis-builder/std",
-	"sp-runtime/std",
-	"substrate-wasm-builder",
 ]

templates/minimal/runtime/build.rs

@@ -18,6 +18,6 @@
 fn main() {
 	#[cfg(feature = "std")]
 	{
-		substrate_wasm_builder::WasmBuilder::build_using_defaults();
+		polkadot_sdk::substrate_wasm_builder::WasmBuilder::build_using_defaults();
 	}
 }

templates/minimal/runtime/src/lib.rs

@@ -26,20 +26,24 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 extern crate alloc;
 
 use alloc::{vec, vec::Vec};
-use frame::{
-	deps::frame_support::{
-		genesis_builder_helper::{build_state, get_preset},
-		runtime,
-		weights::{FixedFee, NoFee},
-	},
-	prelude::*,
-	runtime::{
-		apis::{
-			self, impl_runtime_apis, ApplyExtrinsicResult, CheckInherentsResult,
-			ExtrinsicInclusionMode, OpaqueMetadata,
+use polkadot_sdk::{
+	polkadot_sdk_frame as frame,
+	polkadot_sdk_frame::{
+		deps::frame_support::{
+			genesis_builder_helper::{build_state, get_preset},
+			runtime,
+			weights::{FixedFee, NoFee},
 		},
 		prelude::*,
+		runtime::{
+			apis::{
+				self, impl_runtime_apis, ApplyExtrinsicResult, CheckInherentsResult,
+				ExtrinsicInclusionMode, OpaqueMetadata,
+			},
+			prelude::*,
+		},
 	},
+	*,
 };
 
 /// The runtime version.
@@ -296,7 +300,7 @@ impl_runtime_apis! {
 // https://github.com/paritytech/substrate/issues/10579#issuecomment-1600537558
 pub mod interface {
 	use super::Runtime;
-	use frame::deps::frame_system;
+	use polkadot_sdk::{polkadot_sdk_frame as frame, *};
 
 	pub type Block = super::Block;
 	pub use frame::runtime::types_common::OpaqueBlock;