babe: keep stateless verification in Verifier, move everything else to the import queue

polkadot/node/service/src/builder/partial.rs

@@ -29,6 +29,7 @@ use sc_service::{Configuration, Error as SubstrateServiceError, KeystoreContaine
 use sc_telemetry::{Telemetry, TelemetryWorker, TelemetryWorkerHandle};
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 use sp_consensus::SelectChain;
+use sp_consensus_babe::inherents::BabeCreateInherentDataProviders;
 use sp_consensus_beefy::ecdsa_crypto;
 use std::sync::Arc;
 
@@ -64,6 +65,8 @@ pub(crate) type PolkadotPartialComponents<ChainSelection> = sc_service::PartialC
 					FullGrandpaBlockImport<ChainSelection>,
 					ecdsa_crypto::AuthorityId,
 				>,
+				BabeCreateInherentDataProviders<Block>,
+				ChainSelection,
 			>,
 			sc_consensus_grandpa::LinkHalf<Block, FullClient, ChainSelection>,
 			sc_consensus_babe::BabeLink<Block>,
@@ -184,32 +187,33 @@ where
 		);
 
 	let babe_config = sc_consensus_babe::configuration(&*client)?;
-	let (block_import, babe_link) =
-		sc_consensus_babe::block_import(babe_config.clone(), beefy_block_import, client.clone())?;
+	let slot_duration = babe_config.slot_duration();
+	let (block_import, babe_link) = sc_consensus_babe::block_import(
+		babe_config.clone(),
+		beefy_block_import,
+		client.clone(),
+		Arc::new(move |_, _| async move {
+			let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
+			let slot = sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
+				*timestamp,
+				slot_duration,
+			);
+			Ok((slot, timestamp))
+		}) as BabeCreateInherentDataProviders<Block>,
+		select_chain.clone(),
+		OffchainTransactionPoolFactory::new(transaction_pool.clone()),
+	)?;
 
-	let slot_duration = babe_link.config().slot_duration();
 	let (import_queue, babe_worker_handle) =
 		sc_consensus_babe::import_queue(sc_consensus_babe::ImportQueueParams {
 			link: babe_link.clone(),
 			block_import: block_import.clone(),
 			justification_import: Some(Box::new(justification_import)),
 			client: client.clone(),
-			select_chain: select_chain.clone(),
-			create_inherent_data_providers: move |_, ()| async move {
-				let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
-
-				let slot =
-				sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
-					*timestamp,
-					slot_duration,
-				);
-
-				Ok((slot, timestamp))
-			},
+			slot_duration,
 			spawner: &task_manager.spawn_essential_handle(),
 			registry: config.prometheus_registry(),
 			telemetry: telemetry.as_ref().map(|x| x.handle()),
-			offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool.clone()),
 		})?;
 
 	let justification_stream = grandpa_link.justification_stream();

prdoc/pr_9147.prdoc

@@ -0,0 +1,18 @@
+title: 'babe: keep stateless verification in `Verifier`, move everything else to the
+  import queue'
+doc:
+- audience: Node Operator
+  description: Only do stateless verification without runtime calls in the `BabeVerifier`, do all other verification in the import queue.
+crates:
+- name: polkadot-service
+  bump: patch
+- name: sc-consensus-babe-rpc
+  bump: patch
+- name: sc-consensus-babe
+  bump: major
+- name: sp-consensus-babe
+  bump: minor
+- name: sp-consensus
+  bump: major
+- name: sp-inherents
+  bump: minor

substrate/bin/node/cli/src/service.rs

@@ -22,6 +22,7 @@
 
 use polkadot_sdk::{
 	sc_consensus_beefy as beefy, sc_consensus_grandpa as grandpa,
+	sp_consensus_babe::inherents::BabeCreateInherentDataProviders,
 	sp_consensus_beefy as beefy_primitives, *,
 };
 
@@ -190,6 +191,8 @@ pub fn new_partial(
 					Block,
 					FullClient,
 					FullBeefyBlockImport<FullGrandpaBlockImport>,
+					BabeCreateInherentDataProviders<Block>,
+					FullSelectChain,
 				>,
 				grandpa::LinkHalf<Block, FullClient, FullSelectChain>,
 				sc_consensus_babe::BabeLink<Block>,
@@ -259,35 +262,35 @@ pub fn new_partial(
 			config.prometheus_registry().cloned(),
 		);
 
+	let babe_config = sc_consensus_babe::configuration(&*client)?;
+	let slot_duration = babe_config.slot_duration();
 	let (block_import, babe_link) = sc_consensus_babe::block_import(
-		sc_consensus_babe::configuration(&*client)?,
+		babe_config,
 		beefy_block_import,
 		client.clone(),
+		Arc::new(move |_, _| async move {
+			let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
+			let slot =
+			sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
+				*timestamp,
+				slot_duration,
+			);
+			Ok((slot, timestamp))
+		}) as BabeCreateInherentDataProviders<Block>,
+		select_chain.clone(),
+		OffchainTransactionPoolFactory::new(transaction_pool.clone()),
 	)?;
 
-	let slot_duration = babe_link.config().slot_duration();
 	let (import_queue, babe_worker_handle) =
 		sc_consensus_babe::import_queue(sc_consensus_babe::ImportQueueParams {
 			link: babe_link.clone(),
 			block_import: block_import.clone(),
 			justification_import: Some(Box::new(justification_import)),
 			client: client.clone(),
-			select_chain: select_chain.clone(),
-			create_inherent_data_providers: move |_, ()| async move {
-				let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
-
-				let slot =
-				sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
-					*timestamp,
-					slot_duration,
-				);
-
-				Ok((slot, timestamp))
-			},
+			slot_duration,
 			spawner: &task_manager.spawn_essential_handle(),
 			registry: config.prometheus_registry(),
 			telemetry: telemetry.as_ref().map(|x| x.handle()),
-			offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool.clone()),
 		})?;
 
 	let import_setup = (block_import, grandpa_link, babe_link, beefy_voter_links);
@@ -408,6 +411,8 @@ pub fn new_full_base<N: NetworkBackend<Block, <Block as BlockT>::Hash>>(
 			Block,
 			FullClient,
 			FullBeefyBlockImport<FullGrandpaBlockImport>,
+			BabeCreateInherentDataProviders<Block>,
+			FullSelectChain,
 		>,
 		&sc_consensus_babe::BabeLink<Block>,
 	),
@@ -926,7 +931,7 @@ mod tests {
 						config,
 						None,
 						false,
-						|block_import: &sc_consensus_babe::BabeBlockImport<Block, _, _>,
+						|block_import: &sc_consensus_babe::BabeBlockImport<Block, _, _, _, _>,
 						 babe_link: &sc_consensus_babe::BabeLink<Block>| {
 							setup_handles = Some((block_import.clone(), babe_link.clone()));
 						},

substrate/client/consensus/babe/Cargo.toml

@@ -45,13 +45,13 @@ sp-crypto-hashing = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
+sp-timestamp = { workspace = true, default-features = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
 sc-block-builder = { workspace = true, default-features = true }
 sc-network-test = { workspace = true }
 sp-keyring = { workspace = true, default-features = true }
-sp-timestamp = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
 substrate-test-runtime-client = { workspace = true }
 tokio = { workspace = true, default-features = true }

substrate/client/consensus/babe/rpc/src/lib.rs

@@ -224,28 +224,30 @@ mod tests {
 		let config = sc_consensus_babe::configuration(&*client).expect("config available");
 		let slot_duration = config.slot_duration();
 
-		let (block_import, link) =
-			sc_consensus_babe::block_import(config.clone(), client.clone(), client.clone())
-				.expect("can initialize block-import");
+		let (block_import, link) = sc_consensus_babe::block_import(
+			config.clone(),
+			client.clone(),
+			client.clone(),
+			move |_, _| async move {
+				Ok((InherentDataProvider::from_timestamp_and_slot_duration(
+					0.into(),
+					slot_duration,
+				),))
+			},
+			longest_chain.clone(),
+			OffchainTransactionPoolFactory::new(RejectAllTxPool::default()),
+		)
+		.expect("can initialize block-import");
 
 		let (_, babe_worker_handle) = sc_consensus_babe::import_queue(ImportQueueParams {
 			link: link.clone(),
 			block_import: block_import.clone(),
 			justification_import: None,
 			client: client.clone(),
-			select_chain: longest_chain.clone(),
-			create_inherent_data_providers: move |_, _| async move {
-				Ok((InherentDataProvider::from_timestamp_and_slot_duration(
-					0.into(),
-					slot_duration,
-				),))
-			},
+			slot_duration,
 			spawner: &task_executor,
 			registry: None,
 			telemetry: None,
-			offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(
-				RejectAllTxPool::default(),
-			),
 		})
 		.unwrap();