Moves Block, NodeBlock and UncheckedExtrinsic to frame_system, instead of construct_runtime

bin/node-template/pallets/template/src/mock.rs

@@ -1,20 +1,13 @@
 use crate as pallet_template;
 use frame_support::traits::{ConstU16, ConstU64};
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
+use sp_runtime::traits::{BlakeTwo256, IdentityLookup};
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 
 // Configure a mock runtime to test the pallet.
 frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
+	pub enum Test
 	{
 		System: frame_system,
 		TemplateModule: pallet_template,
@@ -29,12 +22,11 @@ impl frame_system::Config for Test {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = u64;
-	type BlockNumber = u64;
 	type Hash = H256;
 	type Hashing = BlakeTwo256;
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = ConstU64<250>;
 	type Version = ();

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

@@ -13,7 +13,8 @@ use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	traits::{
-		AccountIdLookup, BlakeTwo256, Block as BlockT, IdentifyAccount, NumberFor, One, Verify,
+		AccountIdLookup, BlakeTwo256, Block as BlockT, HeaderProvider, IdentifyAccount, NumberFor,
+		One, Verify,
 	},
 	transaction_validity::{TransactionSource, TransactionValidity},
 	ApplyExtrinsicResult, MultiSignature,
@@ -155,6 +156,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).
@@ -167,14 +170,10 @@ impl frame_system::Config for Runtime {
 	type Lookup = AccountIdLookup<AccountId, ()>;
 	/// The index type for storing how many extrinsics an account has signed.
 	type Index = Index;
-	/// The index type for blocks.
-	type BlockNumber = BlockNumber;
 	/// The type for hashing blocks and tries.
 	type Hash = Hash;
 	/// The hashing algorithm used.
 	type Hashing = BlakeTwo256;
-	/// The header type.
-	type Header = generic::Header<BlockNumber, BlakeTwo256>;
 	/// The ubiquitous event type.
 	type RuntimeEvent = RuntimeEvent;
 	/// The ubiquitous origin type.
@@ -278,12 +277,7 @@ 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,
-	{
+	pub struct Runtime {
 		System: frame_system,
 		Timestamp: pallet_timestamp,
 		Aura: pallet_aura,
@@ -354,7 +348,7 @@ impl_runtime_apis! {
 			Executive::execute_block(block);
 		}
 
-		fn initialize_block(header: &<Block as BlockT>::Header) {
+		fn initialize_block(header: &<Block as HeaderProvider>::Header) {
 			Executive::initialize_block(header)
 		}
 	}
@@ -378,7 +372,7 @@ impl_runtime_apis! {
 			Executive::apply_extrinsic(extrinsic)
 		}
 
-		fn finalize_block() -> <Block as BlockT>::Header {
+		fn finalize_block() -> <Block as HeaderProvider>::Header {
 			Executive::finalize_block()
 		}
 
@@ -398,14 +392,14 @@ impl_runtime_apis! {
 		fn validate_transaction(
 			source: TransactionSource,
 			tx: <Block as BlockT>::Extrinsic,
-			block_hash: <Block as BlockT>::Hash,
+			block_hash: <Block as HeaderProvider>::Hash,
 		) -> TransactionValidity {
 			Executive::validate_transaction(source, tx, block_hash)
 		}
 	}
 
 	impl sp_offchain::OffchainWorkerApi<Block> for Runtime {
-		fn offchain_worker(header: &<Block as BlockT>::Header) {
+		fn offchain_worker(header: &<Block as HeaderProvider>::Header) {
 			Executive::offchain_worker(header)
 		}
 	}
@@ -443,7 +437,7 @@ impl_runtime_apis! {
 
 		fn submit_report_equivocation_unsigned_extrinsic(
 			_equivocation_proof: sp_consensus_grandpa::EquivocationProof<
-				<Block as BlockT>::Hash,
+				<Block as HeaderProvider>::Hash,
 				NumberFor<Block>,
 			>,
 			_key_owner_proof: sp_consensus_grandpa::OpaqueKeyOwnershipProof,

bin/node/cli/src/service.rs

@@ -39,7 +39,7 @@ use sc_statement_store::Store as StatementStore;
 use sc_telemetry::{Telemetry, TelemetryWorker};
 use sp_api::ProvideRuntimeApi;
 use sp_core::crypto::Pair;
-use sp_runtime::{generic, traits::Block as BlockT, SaturatedConversion};
+use sp_runtime::{generic, traits::HeaderProvider, SaturatedConversion};
 use std::sync::Arc;
 
 /// The full client type definition.
@@ -305,7 +305,7 @@ pub struct NewFullBase {
 	/// The client instance of the node.
 	pub client: Arc<FullClient>,
 	/// The networking service of the node.
-	pub network: Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
+	pub network: Arc<NetworkService<Block, <Block as HeaderProvider>::Hash>>,
 	/// The syncing service of the node.
 	pub sync: Arc<SyncingService<Block>>,
 	/// The transaction pool of the node.

bin/node/rpc/src/lib.rs

@@ -107,7 +107,11 @@ where
 		+ Send
 		+ 'static,
 	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,
-	C::Api: mmr_rpc::MmrRuntimeApi<Block, <Block as sp_runtime::traits::Block>::Hash, BlockNumber>,
+	C::Api: mmr_rpc::MmrRuntimeApi<
+		Block,
+		<Block as sp_runtime::traits::HeaderProvider>::Hash,
+		BlockNumber,
+	>,
 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
 	C::Api: BabeApi<Block>,
 	C::Api: BlockBuilder<Block>,

bin/node/runtime/src/lib.rs

@@ -74,8 +74,8 @@ use sp_runtime::{
 	curve::PiecewiseLinear,
 	generic, impl_opaque_keys,
 	traits::{
-		self, AccountIdConversion, BlakeTwo256, Block as BlockT, Bounded, ConvertInto, NumberFor,
-		OpaqueKeys, SaturatedConversion, StaticLookup,
+		self, AccountIdConversion, BlakeTwo256, Block as BlockT, Bounded, ConvertInto,
+		HeaderProvider, NumberFor, OpaqueKeys, SaturatedConversion, StaticLookup,
 	},
 	transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
 	ApplyExtrinsicResult, FixedPointNumber, FixedU128, Perbill, Percent, Permill, Perquintill,
@@ -227,12 +227,11 @@ impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
 	type Index = Index;
-	type BlockNumber = BlockNumber;
 	type Hash = Hash;
 	type Hashing = BlakeTwo256;
 	type AccountId = AccountId;
 	type Lookup = Indices;
-	type Header = generic::Header<BlockNumber, BlakeTwo256>;
+	type Block = Block;
 	type RuntimeEvent = RuntimeEvent;
 	type BlockHashCount = BlockHashCount;
 	type Version = Version;
@@ -1862,10 +1861,7 @@ impl pallet_statement::Config for Runtime {
 }
 
 construct_runtime!(
-	pub struct Runtime where
-		Block = Block,
-		NodeBlock = node_primitives::Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+	pub struct Runtime
 	{
 		System: frame_system,
 		Utility: pallet_utility,
@@ -2077,7 +2073,7 @@ impl_runtime_apis! {
 			Executive::execute_block(block);
 		}
 
-		fn initialize_block(header: &<Block as BlockT>::Header) {
+		fn initialize_block(header: &<Block as HeaderProvider>::Header) {
 			Executive::initialize_block(header)
 		}
 	}
@@ -2101,7 +2097,7 @@ impl_runtime_apis! {
 			Executive::apply_extrinsic(extrinsic)
 		}
 
-		fn finalize_block() -> <Block as BlockT>::Header {
+		fn finalize_block() -> <Block as HeaderProvider>::Header {
 			Executive::finalize_block()
 		}
 
@@ -2118,7 +2114,7 @@ impl_runtime_apis! {
 		fn validate_transaction(
 			source: TransactionSource,
 			tx: <Block as BlockT>::Extrinsic,
-			block_hash: <Block as BlockT>::Hash,
+			block_hash: <Block as HeaderProvider>::Hash,
 		) -> TransactionValidity {
 			Executive::validate_transaction(source, tx, block_hash)
 		}
@@ -2134,7 +2130,7 @@ impl_runtime_apis! {
 	}
 
 	impl sp_offchain::OffchainWorkerApi<Block> for Runtime {
-		fn offchain_worker(header: &<Block as BlockT>::Header) {
+		fn offchain_worker(header: &<Block as HeaderProvider>::Header) {
 			Executive::offchain_worker(header)
 		}
 	}
@@ -2150,7 +2146,7 @@ impl_runtime_apis! {
 
 		fn submit_report_equivocation_unsigned_extrinsic(
 			equivocation_proof: sp_consensus_grandpa::EquivocationProof<
-				<Block as BlockT>::Hash,
+				<Block as HeaderProvider>::Hash,
 				NumberFor<Block>,
 			>,
 			key_owner_proof: sp_consensus_grandpa::OpaqueKeyOwnershipProof,
@@ -2232,7 +2228,7 @@ impl_runtime_apis! {
 		}
 
 		fn submit_report_equivocation_unsigned_extrinsic(
-			equivocation_proof: sp_consensus_babe::EquivocationProof<<Block as BlockT>::Header>,
+			equivocation_proof: sp_consensus_babe::EquivocationProof<<Block as HeaderProvider>::Header>,
 			key_owner_proof: sp_consensus_babe::OpaqueKeyOwnershipProof,
 		) -> Option<()> {
 			let key_owner_proof = key_owner_proof.decode()?;

client/api/src/backend.rs

@@ -25,7 +25,7 @@ use parking_lot::RwLock;
 use sp_consensus::BlockOrigin;
 use sp_core::offchain::OffchainStorage;
 use sp_runtime::{
-	traits::{Block as BlockT, HashFor, NumberFor},
+	traits::{Block as BlockT, HashFor, HeaderProvider, NumberFor},
 	Justification, Justifications, StateVersion, Storage,
 };
 use sp_state_machine::{
@@ -444,7 +444,7 @@ pub trait StorageProvider<Block: BlockT, B: Backend<Block>> {
 	/// values in that block.
 	fn storage_pairs(
 		&self,
-		hash: <Block as BlockT>::Hash,
+		hash: <Block as HeaderProvider>::Hash,
 		prefix: Option<&StorageKey>,
 		start_key: Option<&StorageKey>,
 	) -> sp_blockchain::Result<PairsIter<B::State, Block>>;

client/api/src/client.rs

@@ -22,7 +22,7 @@ use sp_consensus::BlockOrigin;
 use sp_core::storage::StorageKey;
 use sp_runtime::{
 	generic::SignedBlock,
-	traits::{Block as BlockT, NumberFor},
+	traits::{Block as BlockT, HeaderProvider, NumberFor},
 	Justifications,
 };
 use std::{collections::HashSet, fmt, sync::Arc};
@@ -44,12 +44,12 @@ pub type FinalityNotifications<Block> = TracingUnboundedReceiver<FinalityNotific
 /// This may be used as chain spec extension to set trusted checkpoints, i.e.
 /// the client will refuse to import a block with a different hash at the given
 /// height.
-pub type ForkBlocks<Block> = Option<Vec<(NumberFor<Block>, <Block as BlockT>::Hash)>>;
+pub type ForkBlocks<Block> = Option<Vec<(NumberFor<Block>, <Block as HeaderProvider>::Hash)>>;
 
 /// Known bad block hashes.
 ///
 /// This may be used as chain spec extension to filter out known, unwanted forks.
-pub type BadBlocks<Block> = Option<HashSet<<Block as BlockT>::Hash>>;
+pub type BadBlocks<Block> = Option<HashSet<<Block as HeaderProvider>::Hash>>;
 
 /// Figure out the block type for a given type (for now, just a `Client`).
 pub trait BlockOf {

client/api/src/in_mem.rs

@@ -25,7 +25,7 @@ use sp_core::{
 };
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block as BlockT, HashFor, Header as HeaderT, NumberFor, Zero},
+	traits::{Block as BlockT, HashFor, Header as HeaderT, HeaderProvider, NumberFor, Zero},
 	Justification, Justifications, StateVersion, Storage,
 };
 use sp_state_machine::{
@@ -155,7 +155,7 @@ impl<Block: BlockT> Blockchain<Block> {
 	pub fn insert(
 		&self,
 		hash: Block::Hash,
-		header: <Block as BlockT>::Header,
+		header: <Block as sp_runtime::traits::HeaderProvider>::Header,
 		justifications: Option<Justifications>,
 		body: Option<Vec<<Block as BlockT>::Extrinsic>>,
 		new_state: NewBlockState,
@@ -225,7 +225,10 @@ impl<Block: BlockT> Blockchain<Block> {
 		self.apply_head(&header)
 	}
 
-	fn apply_head(&self, header: &<Block as BlockT>::Header) -> sp_blockchain::Result<()> {
+	fn apply_head(
+		&self,
+		header: &<Block as sp_runtime::traits::HeaderProvider>::Header,
+	) -> sp_blockchain::Result<()> {
 		let hash = header.hash();
 		let number = header.number();
 
@@ -331,7 +334,7 @@ impl<Block: BlockT> HeaderBackend<Block> for Blockchain<Block> {
 	fn header(
 		&self,
 		hash: Block::Hash,
-	) -> sp_blockchain::Result<Option<<Block as BlockT>::Header>> {
+	) -> sp_blockchain::Result<Option<<Block as sp_runtime::traits::HeaderProvider>::Header>> {
 		Ok(self.storage.read().blocks.get(&hash).map(|b| b.header().clone()))
 	}
 
@@ -366,7 +369,7 @@ impl<Block: BlockT> HeaderBackend<Block> for Blockchain<Block> {
 
 	fn hash(
 		&self,
-		number: <<Block as BlockT>::Header as HeaderT>::Number,
+		number: <<Block as sp_runtime::traits::HeaderProvider>::Header as HeaderT>::Number,
 	) -> sp_blockchain::Result<Option<Block::Hash>> {
 		Ok(self.id(BlockId::Number(number)))
 	}
@@ -525,7 +528,7 @@ impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperatio
 
 	fn set_block_data(
 		&mut self,
-		header: <Block as BlockT>::Header,
+		header: <Block as sp_runtime::traits::HeaderProvider>::Header,
 		body: Option<Vec<<Block as BlockT>::Extrinsic>>,
 		_indexed_body: Option<Vec<Vec<u8>>>,
 		justifications: Option<Justifications>,
@@ -632,7 +635,7 @@ impl<Block: BlockT> Backend<Block> {
 	/// # Warning
 	///
 	/// For testing purposes only!
-	pub fn pin_refs(&self, hash: &<Block as BlockT>::Hash) -> Option<i64> {
+	pub fn pin_refs(&self, hash: &<Block as HeaderProvider>::Hash) -> Option<i64> {
 		let blocks = self.pinned_blocks.read();
 		blocks.get(hash).map(|value| *value)
 	}
@@ -779,13 +782,13 @@ impl<Block: BlockT> backend::Backend<Block> for Backend<Block> {
 		false
 	}
 
-	fn pin_block(&self, hash: <Block as BlockT>::Hash) -> blockchain::Result<()> {
+	fn pin_block(&self, hash: <Block as HeaderProvider>::Hash) -> blockchain::Result<()> {
 		let mut blocks = self.pinned_blocks.write();
 		*blocks.entry(hash).or_default() += 1;
 		Ok(())
 	}
 
-	fn unpin_block(&self, hash: <Block as BlockT>::Hash) {
+	fn unpin_block(&self, hash: <Block as HeaderProvider>::Hash) {
 		let mut blocks = self.pinned_blocks.write();
 		blocks.entry(hash).and_modify(|counter| *counter -= 1).or_insert(-1);
 	}