Use umbrella crate for minimal template

docs/sdk/src/reference_docs/chain_spec_runtime/src/runtime.rs

@@ -32,10 +32,7 @@ use frame::{
 		runtime,
 	},
 	prelude::*,
-	runtime::{
-		apis::{self, impl_runtime_apis, ExtrinsicInclusionMode},
-		prelude::*,
-	},
+	runtime::{apis, prelude::*},
 };
 use sp_genesis_builder::PresetId;
 

prdoc/pr_5155.prdoc

@@ -0,0 +1,14 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: Use umbrella crate for minimal template
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      Minor additions to the `polkadot-sdk-frame` crate and making it ready for usage in more templates. This PR already integrates it in the minimal template.
+
+
+crates:
+  - name: polkadot-sdk-frame
+    bump: patch

substrate/frame/src/lib.rs

@@ -177,21 +177,34 @@ pub mod runtime {
 		pub use frame_executive::*;
 
 		/// Macro to amalgamate the runtime into `struct Runtime`.
+		///
+		/// Consider using the new version of this [`frame_construct_runtime`].
 		pub use frame_support::construct_runtime;
 
+		/// Macro to amalgamate the runtime into `struct Runtime`.
+		///
+		/// This is the newer version of [`construct_runtime`].
+		pub use frame_support::runtime as frame_construct_runtime;
+
 		/// Macro to easily derive the `Config` trait of various pallet for `Runtime`.
 		pub use frame_support::derive_impl;
 
 		/// Macros to easily impl traits such as `Get` for types.
 		// TODO: using linking in the Get in the line above triggers an ICE :/
 		pub use frame_support::{ord_parameter_types, parameter_types};
 
+		/// For building genesis config.
+		pub use frame_support::genesis_builder_helper::{build_state, get_preset};
+
 		/// Const types that can easily be used in conjuncture with `Get`.
 		pub use frame_support::traits::{
 			ConstBool, ConstI128, ConstI16, ConstI32, ConstI64, ConstI8, ConstU128, ConstU16,
 			ConstU32, ConstU64, ConstU8,
 		};
 
+		/// Used for simple fee calculation.
+		pub use frame_support::weights::{self, FixedFee, NoFee};
+
 		/// Primary types used to parameterize `EnsureOrigin` and `EnsureRootWithArg`.
 		pub use frame_system::{
 			EnsureNever, EnsureNone, EnsureRoot, EnsureRootWithSuccess, EnsureSigned,
@@ -201,11 +214,16 @@ pub mod runtime {
 		/// Types to define your runtime version.
 		pub use sp_version::{create_runtime_str, runtime_version, RuntimeVersion};
 
+		#[cfg(feature = "std")]
+		pub use sp_version::NativeVersion;
+
 		/// Macro to implement runtime APIs.
 		pub use sp_api::impl_runtime_apis;
 
-		#[cfg(feature = "std")]
-		pub use sp_version::NativeVersion;
+		// Types often used in the runtime APIs.
+		pub use sp_core::OpaqueMetadata;
+		pub use sp_inherents::{CheckInherentsResult, InherentData};
+		pub use sp_runtime::{ApplyExtrinsicResult, ExtrinsicInclusionMode};
 	}
 
 	/// Types and traits for runtimes that implement runtime APIs.
@@ -223,11 +241,6 @@ pub mod runtime {
 	// moved to file similarly.
 	#[allow(ambiguous_glob_reexports)]
 	pub mod apis {
-		// Types often used in the runtime APIs.
-		pub use sp_core::OpaqueMetadata;
-		pub use sp_inherents::{CheckInherentsResult, InherentData};
-		pub use sp_runtime::{ApplyExtrinsicResult, ExtrinsicInclusionMode};
-
 		pub use frame_system_rpc_runtime_api::*;
 		pub use sp_api::{self, *};
 		pub use sp_block_builder::*;

substrate/frame/support/test/tests/pallet_outer_enums_explicit.rs

@@ -19,8 +19,6 @@ use frame_support::derive_impl;
 
 mod common;
 
-use common::outer_enums::{pallet, pallet2};
-
 pub type Header = sp_runtime::generic::Header<u32, sp_runtime::traits::BlakeTwo256>;
 pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, RuntimeCall, (), ()>;
@@ -75,8 +73,10 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[cfg(feature = "experimental")]
 #[test]
 fn module_error_outer_enum_expand_explicit() {
+	use common::outer_enums::{pallet, pallet2};
 	// The Runtime has *all* parts explicitly defined.
 
 	// Check that all error types are propagated
@@ -90,9 +90,7 @@ fn module_error_outer_enum_expand_explicit() {
 			frame_system::Error::NonZeroRefCount => (),
 			frame_system::Error::CallFiltered => (),
 			frame_system::Error::MultiBlockMigrationsOngoing => (),
-			#[cfg(feature = "experimental")]
 			frame_system::Error::InvalidTask => (),
-			#[cfg(feature = "experimental")]
 			frame_system::Error::FailedTask => (),
 			frame_system::Error::NothingAuthorized => (),
 			frame_system::Error::Unauthorized => (),

substrate/frame/support/test/tests/pallet_outer_enums_implicit.rs

@@ -19,8 +19,6 @@ use frame_support::derive_impl;
 
 mod common;
 
-use common::outer_enums::{pallet, pallet2};
-
 pub type Header = sp_runtime::generic::Header<u32, sp_runtime::traits::BlakeTwo256>;
 pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, RuntimeCall, (), ()>;
@@ -75,8 +73,10 @@ frame_support::construct_runtime!(
 	}
 );
 
+#[cfg(feature = "experimental")]
 #[test]
 fn module_error_outer_enum_expand_implicit() {
+	use common::outer_enums::{pallet, pallet2};
 	// The Runtime has *all* parts implicitly defined.
 
 	// Check that all error types are propagated
@@ -90,9 +90,7 @@ fn module_error_outer_enum_expand_implicit() {
 			frame_system::Error::NonZeroRefCount => (),
 			frame_system::Error::CallFiltered => (),
 			frame_system::Error::MultiBlockMigrationsOngoing => (),
-			#[cfg(feature = "experimental")]
 			frame_system::Error::InvalidTask => (),
-			#[cfg(feature = "experimental")]
 			frame_system::Error::FailedTask => (),
 			frame_system::Error::NothingAuthorized => (),
 			frame_system::Error::Unauthorized => (),

templates/minimal/node/Cargo.toml

@@ -21,43 +21,15 @@ 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 = ["experimental", "node"] }
 minimal-template-runtime = { workspace = true }
 
 [build-dependencies]
-substrate-build-script-utils = { workspace = true, default-features = true }
+polkadot-sdk = { workspace = true, features = ["substrate-build-script-utils"] }
 
 [features]
 default = ["std"]
 std = [
 	"minimal-template-runtime/std",
+	"polkadot-sdk/std",
 ]

templates/minimal/node/build.rs

@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-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();

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;
@@ -42,8 +45,8 @@ pub fn development_config() -> Result<ChainSpec, String> {
 
 /// Configure initial storage state for FRAME pallets.
 fn testnet_genesis() -> Value {
-	use frame::traits::Get;
 	use minimal_template_runtime::interface::{Balance, MinimumBalance};
+	use polkadot_sdk::polkadot_sdk_frame::traits::Get;
 	let endowment = <MinimumBalance as Get<Balance>>::get().max(1) * 1000;
 	let balances = AccountKeyring::iter()
 		.map(|a| (a.to_account_id(), endowment))

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, *};
 
 impl SubstrateCli for Cli {
 	fn impl_name() -> String {

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,14 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { features = [
-	"derive",
-], workspace = true }
-scale-info = { features = [
-	"derive",
-], workspace = true }
-frame = { features = [
+codec = { features = ["derive"], workspace = true }
+scale-info = { features = ["derive"], workspace = true }
+polkadot-sdk = { workspace = true, default-features = false, features = [
 	"experimental",
 	"runtime",
-], workspace = true }
+] }
 
 
 [features]
 default = ["std"]
-std = ["codec/std", "frame/std", "scale-info/std"]
+std = ["codec/std", "polkadot-sdk/std", "scale-info/std"]