Add after_inherents

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

@@ -354,7 +354,7 @@ impl_runtime_apis! {
 			Executive::execute_block(block);
 		}
 
-		fn initialize_block(header: &<Block as BlockT>::Header) {
+		fn initialize_block(header: &<Block as BlockT>::Header) -> sp_runtime::RuntimeExecutiveMode {
 			Executive::initialize_block(header)
 		}
 	}
@@ -392,6 +392,10 @@ impl_runtime_apis! {
 		) -> sp_inherents::CheckInherentsResult {
 			data.check_extrinsics(&block)
 		}
+
+		fn after_inherents(mode: sp_runtime::RuntimeExecutiveMode) {
+			Executive::after_inherents(mode)
+		}
 	}
 
 	impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {

bin/node/runtime/src/lib.rs

@@ -2085,7 +2085,7 @@ impl_runtime_apis! {
 			Executive::execute_block(block);
 		}
 
-		fn initialize_block(header: &<Block as BlockT>::Header) {
+		fn initialize_block(header: &<Block as BlockT>::Header) -> sp_runtime::RuntimeExecutiveMode {
 			Executive::initialize_block(header)
 		}
 	}
@@ -2120,6 +2120,10 @@ impl_runtime_apis! {
 		fn check_inherents(block: Block, data: InherentData) -> CheckInherentsResult {
 			data.check_extrinsics(&block)
 		}
+
+		fn after_inherents(mode: sp_runtime::RuntimeExecutiveMode) {
+			Executive::after_inherents(mode)
+		}
 	}
 
 	impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {

client/basic-authorship/src/basic_authorship.rs

@@ -39,7 +39,7 @@ use sp_core::traits::SpawnNamed;
 use sp_inherents::InherentData;
 use sp_runtime::{
 	traits::{BlakeTwo256, Block as BlockT, Hash as HashT, Header as HeaderT},
-	Digest, Percent, SaturatedConversion,
+	Digest, Percent, RuntimeExecutiveMode, SaturatedConversion,
 };
 use std::{marker::PhantomData, pin::Pin, sync::Arc, time};
 
@@ -347,12 +347,14 @@ where
 
 		self.apply_inherents(&mut block_builder, inherent_data)?;
 
-		// TODO call `after_inherents` and check if we should apply extrinsincs here
-		// <https://github.com/paritytech/substrate/pull/14275/>
-
 		let block_timer = time::Instant::now();
-		let end_reason =
-			self.apply_extrinsics(&mut block_builder, deadline, block_size_limit).await?;
+		block_builder.after_inherents(block_builder.executive_mode)?;
+		let end_reason = match block_builder.executive_mode {
+			RuntimeExecutiveMode::Normal =>
+				self.apply_transactions(&mut block_builder, deadline, block_size_limit).await?,
+			RuntimeExecutiveMode::Minimal => EndProposingReason::TransactionsForbidden,
+		};
+
 		let (block, storage_changes, proof) = block_builder.build()?.into_inner();
 		let block_took = block_timer.elapsed();
 
@@ -401,8 +403,8 @@ where
 		Ok(())
 	}
 
-	/// Apply as many extrinsics as possible to the block.
-	async fn apply_extrinsics(
+	/// Apply as many transactions as possible to the block.
+	async fn apply_transactions(
 		&self,
 		block_builder: &mut sc_block_builder::BlockBuilder<'_, Block, C, B>,
 		deadline: time::Instant,

client/block-builder/src/lib.rs

@@ -36,7 +36,7 @@ use sp_core::ExecutionContext;
 use sp_runtime::{
 	legacy,
 	traits::{Block as BlockT, Hash, HashFor, Header as HeaderT, NumberFor, One},
-	Digest,
+	Digest, RuntimeExecutiveMode,
 };
 
 use sc_client_api::backend;
@@ -139,6 +139,8 @@ pub struct BlockBuilder<'a, Block: BlockT, A: ProvideRuntimeApi<Block>, B> {
 	backend: &'a B,
 	/// The estimated size of the block header.
 	estimated_header_size: usize,
+	/// The executive mode of the block that is currently being built.
+	pub executive_mode: RuntimeExecutiveMode,
 }
 
 impl<'a, Block, A, B> BlockBuilder<'a, Block, A, B>
@@ -173,20 +175,29 @@ where
 		let estimated_header_size = header.encoded_size();
 
 		let mut api = api.runtime_api();
+		let version = api
+			.api_version::<dyn BlockBuilderApi<Block>>(parent_hash)?
+			.ok_or_else(|| Error::VersionInvalid("BlockBuilderApi".to_string()))?;
 
 		if record_proof.yes() {
 			api.record_proof();
 		}
 
-		api.initialize_block_with_context(
-			parent_hash,
-			ExecutionContext::BlockConstruction,
-			&header,
-		)?;
-
-		let version = api
-			.api_version::<dyn BlockBuilderApi<Block>>(parent_hash)?
-			.ok_or_else(|| Error::VersionInvalid("BlockBuilderApi".to_string()))?;
+		let executive_mode = if version >= 5 {
+			api.initialize_block_with_context(
+				parent_hash,
+				ExecutionContext::BlockConstruction,
+				&header,
+			)?
+		} else {
+			#[allow(deprecated)]
+			api.initialize_block_before_version_5_with_context(
+				parent_hash,
+				ExecutionContext::BlockConstruction,
+				&header,
+			)?;
+			RuntimeExecutiveMode::Normal
+		};
 
 		Ok(Self {
 			parent_hash,
@@ -195,9 +206,25 @@ where
 			version,
 			backend,
 			estimated_header_size,
+			executive_mode,
 		})
 	}
 
+	/// Called after inherents but before extrinsics have been applied.
+	pub fn after_inherents(&self, mode: RuntimeExecutiveMode) -> Result<(), Error> {
+		if self.version >= 7 {
+			self.api
+				.after_inherents_with_context(
+					self.parent_hash,
+					ExecutionContext::BlockConstruction,
+					mode,
+				)
+				.map_err(Into::into)
+		} else {
+			Ok(())
+		}
+	}
+
 	/// Push onto the block's list of extrinsics.
 	///
 	/// This will ensure the extrinsic can be validly executed (by executing it).

client/proposer-metrics/src/lib.rs

@@ -49,6 +49,8 @@ pub enum EndProposingReason {
 	HitDeadline,
 	HitBlockSizeLimit,
 	HitBlockWeightLimit,
+	/// No transactions are allowed in the block.
+	TransactionsForbidden,
 }
 
 /// Authorship metrics.
@@ -112,6 +114,7 @@ impl Metrics {
 			EndProposingReason::NoMoreTransactions => "no_more_transactions",
 			EndProposingReason::HitBlockSizeLimit => "hit_block_size_limit",
 			EndProposingReason::HitBlockWeightLimit => "hit_block_weight_limit",
+			EndProposingReason::TransactionsForbidden => "transactions_forbidden",
 		};
 
 		self.end_proposing_reason.with_label_values(&[reason]).inc();

client/rpc-spec-v2/src/chain_head/tests.rs

@@ -186,8 +186,8 @@ async fn follow_with_runtime() {
 
 	// it is basically json-encoded substrate_test_runtime_client::runtime::VERSION
 	let runtime_str = "{\"specName\":\"test\",\"implName\":\"parity-test\",\"authoringVersion\":1,\
-		\"specVersion\":2,\"implVersion\":2,\"apis\":[[\"0xdf6acb689907609b\",4],\
-		[\"0x37e397fc7c91f5e4\",2],[\"0xd2bc9897eed08f15\",3],[\"0x40fe3ad401f8959a\",6],\
+		\"specVersion\":2,\"implVersion\":2,\"apis\":[[\"0xdf6acb689907609b\",5],\
+		[\"0x37e397fc7c91f5e4\",2],[\"0xd2bc9897eed08f15\",3],[\"0x40fe3ad401f8959a\",7],\
 		[\"0xbc9d89904f5b923f\",1],[\"0xc6e9a76309f39b09\",2],[\"0xdd718d5cc53262d4\",1],\
 		[\"0xcbca25e39f142387\",2],[\"0xf78b278be53f454c\",2],[\"0xab3c0572291feb8b\",1],\
 		[\"0xed99c5acb25eedf5\",3]],\"transactionVersion\":1,\"stateVersion\":1}";

client/rpc/src/state/tests.rs

@@ -514,8 +514,8 @@ async fn should_return_runtime_version() {
 
 	// it is basically json-encoded substrate_test_runtime_client::runtime::VERSION
 	let result = "{\"specName\":\"test\",\"implName\":\"parity-test\",\"authoringVersion\":1,\
-		\"specVersion\":2,\"implVersion\":2,\"apis\":[[\"0xdf6acb689907609b\",4],\
-		[\"0x37e397fc7c91f5e4\",2],[\"0xd2bc9897eed08f15\",3],[\"0x40fe3ad401f8959a\",6],\
+		\"specVersion\":2,\"implVersion\":2,\"apis\":[[\"0xdf6acb689907609b\",5],\
+		[\"0x37e397fc7c91f5e4\",2],[\"0xd2bc9897eed08f15\",3],[\"0x40fe3ad401f8959a\",7],\
 		[\"0xbc9d89904f5b923f\",1],[\"0xc6e9a76309f39b09\",2],[\"0xdd718d5cc53262d4\",1],\
 		[\"0xcbca25e39f142387\",2],[\"0xf78b278be53f454c\",2],[\"0xab3c0572291feb8b\",1],\
 		[\"0xed99c5acb25eedf5\",3]],\"transactionVersion\":1,\"stateVersion\":1}";

client/transaction-pool/Cargo.toml

@@ -27,6 +27,7 @@ sc-client-api = { version = "4.0.0-dev", path = "../api" }
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "./api" }
 sc-utils = { version = "4.0.0-dev", path = "../utils" }
 sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
+sp-block-builder = { version = "4.0.0-dev", path = "../../primitives/block-builder" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
 sp-core = { version = "21.0.0", path = "../../primitives/core" }
 sp-runtime = { version = "24.0.0", path = "../../primitives/runtime" }

frame/executive/Cargo.toml

@@ -50,4 +50,12 @@ std = [
 	"sp-std/std",
 	"sp-tracing/std",
 ]
-try-runtime = ["frame-support/try-runtime", "frame-try-runtime/try-runtime", "sp-runtime/try-runtime"]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-try-runtime/try-runtime",
+	"sp-runtime/try-runtime",
+	"frame-system/try-runtime",
+	"frame-try-runtime?/try-runtime",
+	"pallet-balances/try-runtime",
+	"pallet-transaction-payment/try-runtime"
+]