Use Extensions to register offchain worker custom extensions

cumulus/parachain-template/node/src/service.rs

@@ -213,7 +213,7 @@ async fn start_node_impl(
 				network_provider: network.clone(),
 				is_validator: parachain_config.role.is_authority(),
 				enable_http_requests: false,
-				custom_extensions: move |_| vec![],
+				custom_extensions: move |_| Default::default(),
 			})
 			.run(client.clone(), task_manager.spawn_handle())
 			.boxed(),

polkadot/node/service/src/lib.rs

@@ -909,7 +909,7 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 				network_provider: network.clone(),
 				is_validator: role.is_authority(),
 				enable_http_requests: false,
-				custom_extensions: move |_| vec![],
+				custom_extensions: move |_| Default::default(),
 			})
 			.run(client.clone(), task_manager.spawn_handle())
 			.boxed(),

substrate/bin/node-template/node/src/service.rs

@@ -200,7 +200,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 				)),
 				network_provider: network.clone(),
 				enable_http_requests: true,
-				custom_extensions: |_| vec![],
+				custom_extensions: |_| Default::default(),
 			})
 			.run(client.clone(), task_manager.spawn_handle())
 			.boxed(),

substrate/bin/node/cli/Cargo.toml

@@ -57,6 +57,7 @@ sp-timestamp = { path = "../../../primitives/timestamp" }
 sp-inherents = { path = "../../../primitives/inherents" }
 sp-keyring = { path = "../../../primitives/keyring" }
 sp-keystore = { path = "../../../primitives/keystore" }
+sp-externalities = { path = "../../../primitives/externalities" }
 sp-consensus = { path = "../../../primitives/consensus/common" }
 sp-transaction-storage-proof = { path = "../../../primitives/transaction-storage-proof" }
 sp-io = { path = "../../../primitives/io" }

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

@@ -39,6 +39,7 @@ use sc_telemetry::{Telemetry, TelemetryWorker};
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 use sp_api::ProvideRuntimeApi;
 use sp_core::crypto::Pair;
+use sp_externalities::Extensions;
 use sp_runtime::{generic, traits::Block as BlockT, SaturatedConversion};
 use std::sync::Arc;
 
@@ -602,7 +603,9 @@ pub fn new_full_base(
 				is_validator: role.is_authority(),
 				enable_http_requests: true,
 				custom_extensions: move |_| {
-					vec![Box::new(statement_store.clone().as_statement_store_ext()) as Box<_>]
+					let mut extensions = Extensions::new();
+					extensions.register(statement_store.clone().as_statement_store_ext());
+					extensions
 				},
 			})
 			.run(client.clone(), task_manager.spawn_handle())

substrate/client/offchain/src/lib.rs

@@ -47,7 +47,7 @@ use sc_network::{NetworkPeers, NetworkStateInfo};
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 use sp_api::{ApiExt, ProvideRuntimeApi};
 use sp_core::{offchain, traits::SpawnNamed};
-use sp_externalities::Extension;
+use sp_externalities::Extensions;
 use sp_keystore::{KeystoreExt, KeystorePtr};
 use sp_runtime::traits::{self, Header};
 use threadpool::ThreadPool;
@@ -120,7 +120,9 @@ pub struct OffchainWorkerOptions<RA, Block: traits::Block, Storage, CE> {
 	///
 	/// ```nocompile
 	/// custom_extensions: |block_hash| {
-	///     vec![MyCustomExtension::new()]
+	///     let extensions = Extensions::new();
+	///     extensions.register(MyCustomExtension::new());
+	///     extensions
 	/// }
 	/// ```
 	pub custom_extensions: CE,
@@ -137,12 +139,12 @@ pub struct OffchainWorkers<RA, Block: traits::Block, Storage> {
 	transaction_pool: Option<OffchainTransactionPoolFactory<Block>>,
 	network_provider: Arc<dyn NetworkProvider + Send + Sync>,
 	is_validator: bool,
-	custom_extensions: Box<dyn Fn(Block::Hash) -> Vec<Box<dyn Extension>> + Send>,
+	custom_extensions: Box<dyn Fn(Block::Hash) -> Extensions + Send>,
 }
 
 impl<RA, Block: traits::Block, Storage> OffchainWorkers<RA, Block, Storage> {
 	/// Creates new [`OffchainWorkers`].
-	pub fn new<CE: Fn(Block::Hash) -> Vec<Box<dyn Extension>> + Send + 'static>(
+	pub fn new<CE: Fn(Block::Hash) -> Extensions + Send + 'static>(
 		OffchainWorkerOptions {
 			runtime_api_provider,
 			keystore,
@@ -283,7 +285,7 @@ where
 					offchain::LimitedExternalities::new(capabilities, api),
 				));
 
-				custom_extensions.into_iter().for_each(|ext| runtime.register_extension(ext));
+				runtime.register_extensions(custom_extensions);
 
 				let run = if version == 2 {
 					runtime.offchain_worker(hash, &header)
@@ -444,7 +446,7 @@ mod tests {
 			network_provider: network,
 			is_validator: false,
 			enable_http_requests: false,
-			custom_extensions: |_| Vec::new(),
+			custom_extensions: |_| Default::default(),
 		});
 		futures::executor::block_on(offchain.on_block_imported(&header));
 

substrate/primitives/api/proc-macro/src/impl_runtime_apis.rs

@@ -365,6 +365,10 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 				fn register_extension<E: #crate_::Extension>(&mut self, extension: E) {
 					std::cell::RefCell::borrow_mut(&self.extensions).register(extension);
 				}
+
+				fn register_extensions(&mut self, extension: #crate_::Extensions) {
+					std::cell::RefCell::borrow_mut(&self.extensions).merge(extension);
+				}
 			}
 
 			impl<Block: #crate_::BlockT, C> #crate_::ConstructRuntimeApi<Block, C>

substrate/primitives/api/proc-macro/src/mock_impl_runtime_apis.rs

@@ -127,6 +127,10 @@ fn implement_common_api_traits(block_type: TypePath, self_ty: Type) -> Result<To
 			fn register_extension<E: #crate_::Extension>(&mut self, _: E) {
 				unimplemented!("`register_extension` not implemented for runtime api mocks")
 			}
+
+			fn register_extensions(&mut self, _: #crate_::Extensions) {
+				unimplemented!("`register_extensions` not implemented for runtime api mocks")
+			}
 		}
 
 		impl #crate_::Core<#block_type> for #self_ty {

substrate/primitives/api/src/lib.rs

@@ -620,6 +620,9 @@ pub trait ApiExt<Block: BlockT> {
 
 	/// Register an [`Extension`] that will be accessible while executing a runtime api call.
 	fn register_extension<E: Extension>(&mut self, extension: E);
+
+	/// Register a set of [`Extensions`] that will be accessible while executing a runtime api call.
+	fn register_extensions(&mut self, extensions: Extensions);
 }
 
 /// Parameters for [`CallApiAt::call_api_at`].