Moves Block to frame_system instead of construct_runtime and removes Header and BlockNumber

bin/node-template/runtime/src/lib.rs

@@ -155,6 +155,8 @@ parameter_types! {
 impl frame_system::Config for Runtime {
 	/// The basic call filter to use in dispatchable.
 	type BaseCallFilter = frame_support::traits::Everything;
+	/// The block type for the runtime.
+	type Block = Block;
 	/// Block & extrinsics weights: base values and limits.
 	type BlockWeights = BlockWeights;
 	/// The maximum length of a block (in bytes).
@@ -279,10 +281,6 @@ impl pallet_template::Config for Runtime {
 // Create the runtime by composing the FRAME pallets that were previously configured.
 construct_runtime!(
 	pub struct Runtime
-	where
-		Block = Block,
-		NodeBlock = opaque::Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
 		System: frame_system,
 		Timestamp: pallet_timestamp,

frame/support/procedural/src/construct_runtime/expand/inherent.rs

@@ -19,12 +19,12 @@ use crate::construct_runtime::Pallet;
 use proc_macro2::TokenStream;
 use quote::quote;
 use std::str::FromStr;
-use syn::{Ident, TypePath};
+use syn::Ident;
 
 pub fn expand_outer_inherent(
 	runtime: &Ident,
-	block: &TypePath,
-	unchecked_extrinsic: &TypePath,
+	block: &TokenStream,
+	unchecked_extrinsic: &TokenStream,
 	pallet_decls: &[Pallet],
 	scrate: &TokenStream,
 ) -> TokenStream {

frame/support/procedural/src/construct_runtime/expand/metadata.rs

@@ -19,13 +19,13 @@ use crate::construct_runtime::Pallet;
 use proc_macro2::TokenStream;
 use quote::quote;
 use std::str::FromStr;
-use syn::{Ident, TypePath};
+use syn::Ident;
 
 pub fn expand_runtime_metadata(
 	runtime: &Ident,
 	pallet_declarations: &[Pallet],
 	scrate: &TokenStream,
-	extrinsic: &TypePath,
+	extrinsic: &TokenStream,
 ) -> TokenStream {
 	let pallets = pallet_declarations
 		.iter()

frame/support/procedural/src/construct_runtime/mod.rs

@@ -151,7 +151,6 @@ use frame_support_procedural_tools::{
 use itertools::Itertools;
 use parse::{
 	ExplicitRuntimeDeclaration, ImplicitRuntimeDeclaration, Pallet, RuntimeDeclaration,
-	WhereSection,
 };
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
@@ -224,9 +223,9 @@ fn construct_runtime_final_expansion(
 ) -> Result<TokenStream2> {
 	let ExplicitRuntimeDeclaration {
 		name,
-		where_section: WhereSection { block, node_block, unchecked_extrinsic },
 		pallets,
 		pallets_token,
+		where_section,
 	} = definition;
 
 	let system_pallet =
@@ -264,6 +263,10 @@ fn construct_runtime_final_expansion(
 	let scrate = generate_crate_access(hidden_crate_name, "frame-support");
 	let scrate_decl = generate_hidden_includes(hidden_crate_name, "frame-support");
 
+	let frame_system = generate_crate_access_2018("frame-system")?;
+	let block = quote!(<#name as #frame_system::Config>::Block);
+	let unchecked_extrinsic = quote!(<#block as #scrate::sp_runtime::traits::Block>::Extrinsic);
+
 	let outer_event = expand::expand_outer_event(&name, &pallets, &scrate)?;
 
 	let outer_origin = expand::expand_outer_origin(&name, system_pallet, &pallets, &scrate)?;
@@ -283,7 +286,22 @@ fn construct_runtime_final_expansion(
 	let integrity_test = decl_integrity_test(&scrate);
 	let static_assertions = decl_static_assertions(&name, &pallets, &scrate);
 
+	let warning = if let Some(where_section) = where_section {
+		Some(proc_macro_warning::Warning::new_deprecated("WhereSection") 
+		.old("use where section") 
+		.new("use `frame_system::Config` to set the `Block` type and remove this section") 
+		.help_links(&[ 
+			"https://github.com/paritytech/substrate/pull/14193" 
+		]) 
+		.span(where_section.span) 
+		.build())
+	} else {
+		None
+	};
+
 	let res = quote!(
+		#warning
+
 		#scrate_decl
 
 		// Prevent UncheckedExtrinsic to print unused warning.
@@ -297,9 +315,6 @@ fn construct_runtime_final_expansion(
 			#scrate::scale_info::TypeInfo
 		)]
 		pub struct #name;
-		impl #scrate::sp_runtime::traits::GetNodeBlockType for #name {
-			type NodeBlock = #node_block;
-		}
 		impl #scrate::sp_runtime::traits::GetRuntimeBlockType for #name {
 			type RuntimeBlock = #block;
 		}

frame/support/procedural/src/construct_runtime/parse.rs

@@ -62,15 +62,15 @@ pub enum RuntimeDeclaration {
 #[derive(Debug)]
 pub struct ImplicitRuntimeDeclaration {
 	pub name: Ident,
-	pub where_section: WhereSection,
+	pub where_section: Option<WhereSection>,
 	pub pallets: Vec<PalletDeclaration>,
 }
 
 /// Declaration of a runtime with all pallet having explicit declaration of parts.
 #[derive(Debug)]
 pub struct ExplicitRuntimeDeclaration {
 	pub name: Ident,
-	pub where_section: WhereSection,
+	pub where_section: Option<WhereSection>,
 	pub pallets: Vec<Pallet>,
 	pub pallets_token: token::Brace,
 }
@@ -87,7 +87,11 @@ impl Parse for RuntimeDeclaration {
 		}
 
 		let name = input.parse::<syn::Ident>()?;
-		let where_section = input.parse()?;
+		let where_section = if input.peek(token::Where) {
+			Some(input.parse()?)
+		} else {
+			None
+		};
 		let pallets =
 			input.parse::<ext::Braces<ext::Punctuated<PalletDeclaration, Token![,]>>>()?;
 		let pallets_token = pallets.token;
@@ -112,6 +116,7 @@ impl Parse for RuntimeDeclaration {
 
 #[derive(Debug)]
 pub struct WhereSection {
+	pub span: Span,
 	pub block: syn::TypePath,
 	pub node_block: syn::TypePath,
 	pub unchecked_extrinsic: syn::TypePath,
@@ -120,6 +125,7 @@ pub struct WhereSection {
 impl Parse for WhereSection {
 	fn parse(input: ParseStream) -> Result<Self> {
 		input.parse::<token::Where>()?;
+
 		let mut definitions = Vec::new();
 		while !input.peek(token::Brace) {
 			let definition: WhereDefinition = input.parse()?;
@@ -143,7 +149,7 @@ impl Parse for WhereSection {
 			);
 			return Err(Error::new(*kind_span, msg))
 		}
-		Ok(Self { block, node_block, unchecked_extrinsic })
+		Ok(Self { span: input.span(), block, node_block, unchecked_extrinsic })
 	}
 }
 

frame/support/procedural/src/pallet/expand/hooks.rs

@@ -75,7 +75,7 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 		let frame_system = &def.frame_system;
 		quote::quote! {
 			impl<#type_impl_gen>
-				#frame_support::traits::Hooks<<T as #frame_system::Config>::BlockNumber>
+				#frame_support::traits::Hooks<#frame_system::pallet_prelude::BlockNumberFor::<T>>
 				for #pallet_ident<#type_use_gen> #where_clause {}
 		}
 	} else {
@@ -137,50 +137,50 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 		#hooks_impl
 
 		impl<#type_impl_gen>
-			#frame_support::traits::OnFinalize<<T as #frame_system::Config>::BlockNumber>
+			#frame_support::traits::OnFinalize<#frame_system::pallet_prelude::BlockNumberFor::<T>>
 			for #pallet_ident<#type_use_gen> #where_clause
 		{
-			fn on_finalize(n: <T as #frame_system::Config>::BlockNumber) {
+			fn on_finalize(n: #frame_system::pallet_prelude::BlockNumberFor::<T>) {
 				#frame_support::sp_tracing::enter_span!(
 					#frame_support::sp_tracing::trace_span!("on_finalize")
 				);
 				<
 					Self as #frame_support::traits::Hooks<
-						<T as #frame_system::Config>::BlockNumber
+						#frame_system::pallet_prelude::BlockNumberFor::<T>
 					>
 				>::on_finalize(n)
 			}
 		}
 
 		impl<#type_impl_gen>
-			#frame_support::traits::OnIdle<<T as #frame_system::Config>::BlockNumber>
+			#frame_support::traits::OnIdle<#frame_system::pallet_prelude::BlockNumberFor::<T>>
 			for #pallet_ident<#type_use_gen> #where_clause
 		{
 			fn on_idle(
-				n: <T as #frame_system::Config>::BlockNumber,
+				n: #frame_system::pallet_prelude::BlockNumberFor::<T>,
 				remaining_weight: #frame_support::weights::Weight
 			) -> #frame_support::weights::Weight {
 				<
 					Self as #frame_support::traits::Hooks<
-						<T as #frame_system::Config>::BlockNumber
+						#frame_system::pallet_prelude::BlockNumberFor::<T>
 					>
 				>::on_idle(n, remaining_weight)
 			}
 		}
 
 		impl<#type_impl_gen>
-			#frame_support::traits::OnInitialize<<T as #frame_system::Config>::BlockNumber>
+			#frame_support::traits::OnInitialize<#frame_system::pallet_prelude::BlockNumberFor::<T>>
 			for #pallet_ident<#type_use_gen> #where_clause
 		{
 			fn on_initialize(
-				n: <T as #frame_system::Config>::BlockNumber
+				n: #frame_system::pallet_prelude::BlockNumberFor::<T>
 			) -> #frame_support::weights::Weight {
 				#frame_support::sp_tracing::enter_span!(
 					#frame_support::sp_tracing::trace_span!("on_initialize")
 				);
 				<
 					Self as #frame_support::traits::Hooks<
-						<T as #frame_system::Config>::BlockNumber
+						#frame_system::pallet_prelude::BlockNumberFor::<T>
 					>
 				>::on_initialize(n)
 			}
@@ -205,7 +205,7 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 
 				<
 					Self as #frame_support::traits::Hooks<
-						<T as #frame_system::Config>::BlockNumber
+						#frame_system::pallet_prelude::BlockNumberFor::<T>
 					>
 				>::on_runtime_upgrade()
 			}
@@ -215,7 +215,7 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 				<
 					Self
 					as
-					#frame_support::traits::Hooks<<T as #frame_system::Config>::BlockNumber>
+					#frame_support::traits::Hooks<#frame_system::pallet_prelude::BlockNumberFor::<T>>
 				>::pre_upgrade()
 			}
 
@@ -226,19 +226,19 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 				<
 					Self
 					as
-					#frame_support::traits::Hooks<<T as #frame_system::Config>::BlockNumber>
+					#frame_support::traits::Hooks<#frame_system::pallet_prelude::BlockNumberFor::<T>>
 				>::post_upgrade(state)
 			}
 		}
 
 		impl<#type_impl_gen>
-			#frame_support::traits::OffchainWorker<<T as #frame_system::Config>::BlockNumber>
+			#frame_support::traits::OffchainWorker<#frame_system::pallet_prelude::BlockNumberFor::<T>>
 			for #pallet_ident<#type_use_gen> #where_clause
 		{
-			fn offchain_worker(n: <T as #frame_system::Config>::BlockNumber) {
+			fn offchain_worker(n: #frame_system::pallet_prelude::BlockNumberFor::<T>) {
 				<
 					Self as #frame_support::traits::Hooks<
-						<T as #frame_system::Config>::BlockNumber
+						#frame_system::pallet_prelude::BlockNumberFor::<T>
 					>
 				>::offchain_worker(n)
 			}
@@ -253,7 +253,7 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 				fn integrity_test() {
 					<
 						Self as #frame_support::traits::Hooks<
-						<T as #frame_system::Config>::BlockNumber
+						#frame_system::pallet_prelude::BlockNumberFor::<T>
 						>
 						>::integrity_test()
 				}
@@ -262,17 +262,17 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 
 		#[cfg(feature = "try-runtime")]
 		impl<#type_impl_gen>
-			#frame_support::traits::TryState<<T as #frame_system::Config>::BlockNumber>
+			#frame_support::traits::TryState<#frame_system::pallet_prelude::BlockNumberFor::<T>>
 			for #pallet_ident<#type_use_gen> #where_clause
 		{
 			fn try_state(
-				n: <T as #frame_system::Config>::BlockNumber,
+				n: #frame_system::pallet_prelude::BlockNumberFor::<T>,
 				_s: #frame_support::traits::TryStateSelect
 			) -> Result<(), #frame_support::sp_runtime::TryRuntimeError> {
 				#log_try_state
 				<
 					Self as #frame_support::traits::Hooks<
-						<T as #frame_system::Config>::BlockNumber
+						#frame_system::pallet_prelude::BlockNumberFor::<T>
 					>
 				>::try_state(n)
 			}

frame/system/src/extensions/check_genesis.rs

@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{Config, Pallet};
+use crate::{Config, Pallet, pallet_prelude::BlockNumberFor};
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;
 use sp_runtime::{
@@ -60,7 +60,7 @@ impl<T: Config + Send + Sync> SignedExtension for CheckGenesis<T> {
 	const IDENTIFIER: &'static str = "CheckGenesis";
 
 	fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
-		Ok(<Pallet<T>>::block_hash(T::BlockNumber::zero()))
+		Ok(<Pallet<T>>::block_hash(BlockNumberFor::<T>::zero()))
 	}
 
 	fn pre_dispatch(

frame/system/src/extensions/check_mortality.rs

@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{BlockHash, Config, Pallet};
+use crate::{BlockHash, Config, Pallet, pallet_prelude::BlockNumberFor};
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;
 use sp_runtime::{
@@ -78,7 +78,7 @@ impl<T: Config + Send + Sync> SignedExtension for CheckMortality<T> {
 
 	fn additional_signed(&self) -> Result<Self::AdditionalSigned, TransactionValidityError> {
 		let current_u64 = <Pallet<T>>::block_number().saturated_into::<u64>();
-		let n = self.0.birth(current_u64).saturated_into::<T::BlockNumber>();
+		let n = self.0.birth(current_u64).saturated_into::<BlockNumberFor<T>>();
 		if !<BlockHash<T>>::contains_key(n) {
 			Err(InvalidTransaction::AncientBirthBlock.into())
 		} else {