git.delta.rocks / unique-network / refs/commits / 4657e257e343

difftreelog

Adjust node to new runtimes

Daniel Shiposha2022-03-05parent: #1f97da5.patch.diff
in: master

6 files changed

modifiednode/cli/Cargo.tomldiffbeforeafterboth
--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -239,8 +239,17 @@
 # Local dependencies
 
 [dependencies.unique-runtime]
-path = '../../runtime'
+path = '../../runtime/unique'
+optional = true
+
+[dependencies.quartz-runtime]
+path = '../../runtime/quartz'
+optional = true
 
+[dependencies.opal-runtime]
+path = '../../runtime/opal'
+optional = true
+
 [dependencies.up-data-structs]
 path = "../../primitives/data-structs"
 default-features = false
@@ -283,10 +292,10 @@
 fp-rpc = { git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" }
 pallet-ethereum = { git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" }
 
-unique-rpc = { path = "../rpc" }
+unique-rpc = { default-features = false, path = "../rpc" }
 
 [features]
-default = []
+default = ["unique-runtime"]
 runtime-benchmarks = [
     'unique-runtime/runtime-benchmarks',
     'polkadot-service/runtime-benchmarks',
modifiednode/cli/src/chain_spec.rsdiffbeforeafterboth
--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -15,7 +15,6 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 use cumulus_primitives_core::ParaId;
-use unique_runtime::*;
 use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup};
 use sc_service::ChainType;
 use sp_core::{sr25519, Pair, Public};
@@ -25,8 +24,19 @@
 use serde::{Deserialize, Serialize};
 use serde_json::map::Map;
 
+#[cfg(feature = "unique-runtime")]
+use unique_runtime as runtime;
+
+#[cfg(feature = "quartz-runtime")]
+use quartz_runtime as runtime;
+
+#[cfg(feature = "opal-runtime")]
+use opal_runtime as runtime;
+
+use runtime::{*, opaque::*};
+
 /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
-pub type ChainSpec = sc_service::GenericChainSpec<unique_runtime::GenesisConfig, Extensions>;
+pub type ChainSpec = sc_service::GenericChainSpec<runtime::GenesisConfig, Extensions>;
 
 /// Helper function to generate a crypto pair from seed
 pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
@@ -217,8 +227,8 @@
 	id: ParaId,
 ) -> GenesisConfig {
 	GenesisConfig {
-		system: unique_runtime::SystemConfig {
-			code: unique_runtime::WASM_BINARY
+		system: runtime::SystemConfig {
+			code: runtime::WASM_BINARY
 				.expect("WASM binary was not build, please build it!")
 				.to_vec(),
 		},
@@ -235,9 +245,9 @@
 			key: Some(root_key),
 		},
 		vesting: VestingConfig { vesting: vec![] },
-		parachain_info: unique_runtime::ParachainInfoConfig { parachain_id: id },
+		parachain_info: runtime::ParachainInfoConfig { parachain_id: id },
 		parachain_system: Default::default(),
-		aura: unique_runtime::AuraConfig {
+		aura: runtime::AuraConfig {
 			authorities: initial_authorities,
 		},
 		aura_ext: Default::default(),
modifiednode/cli/src/command.rsdiffbeforeafterboth
--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -41,7 +41,6 @@
 use cumulus_primitives_core::ParaId;
 use cumulus_client_service::genesis::generate_genesis_block;
 use log::info;
-use unique_runtime::Block;
 use polkadot_parachain::primitives::AccountIdConversion;
 use sc_cli::{
 	ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,
@@ -54,6 +53,17 @@
 use sp_runtime::traits::Block as BlockT;
 use std::{io::Write, net::SocketAddr};
 
+#[cfg(feature = "unique-runtime")]
+use unique_runtime as runtime;
+
+#[cfg(feature = "quartz-runtime")]
+use quartz_runtime as runtime;
+
+#[cfg(feature = "opal-runtime")]
+use opal_runtime as runtime;
+
+use runtime::Block;
+
 fn load_spec(id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
 	Ok(match id {
 		"westend-local" => Box::new(chain_spec::local_testnet_westend_config()),
@@ -104,7 +114,7 @@
 	}
 
 	fn native_runtime_version(_: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
-		&unique_runtime::VERSION
+		&runtime::VERSION
 	}
 }
 
modifiednode/cli/src/service.rsdiffbeforeafterboth
before · node/cli/src/service.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! Service and ServiceFactory implementation. Specialized wrapper over substrate service.1819// std20use std::sync::Arc;21use std::sync::Mutex;22use std::collections::BTreeMap;23use std::time::Duration;24use fc_rpc_core::types::FeeHistoryCache;25use futures::StreamExt;2627use unique_rpc::overrides_handle;28// Local Runtime Types29use unique_runtime::RuntimeApi;3031// Cumulus Imports32use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion};33use cumulus_client_consensus_common::ParachainConsensus;34use cumulus_client_service::{35	prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams,36};37use cumulus_client_network::BlockAnnounceValidator;38use cumulus_primitives_core::ParaId;39use cumulus_relay_chain_interface::RelayChainInterface;40use cumulus_relay_chain_local::build_relay_chain_interface;4142// Substrate Imports43use sc_client_api::ExecutorProvider;44use sc_executor::NativeElseWasmExecutor;45use sc_executor::NativeExecutionDispatch;46use sc_network::NetworkService;47use sc_service::{BasePath, Configuration, PartialComponents, Role, TaskManager};48use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};49use sp_consensus::SlotData;50use sp_keystore::SyncCryptoStorePtr;51use sp_runtime::traits::BlakeTwo256;52use substrate_prometheus_endpoint::Registry;53use sc_client_api::BlockchainEvents;5455// Frontier Imports56use fc_rpc_core::types::FilterPool;57use fc_mapping_sync::{MappingSyncWorker, SyncStrategy};5859// Runtime type overrides60type BlockNumber = u32;61type Header = sp_runtime::generic::Header<BlockNumber, sp_runtime::traits::BlakeTwo256>;62pub type Block = sp_runtime::generic::Block<Header, sp_runtime::OpaqueExtrinsic>;63type Hash = sp_core::H256;6465/// Native executor instance.66pub struct ParachainRuntimeExecutor;6768impl NativeExecutionDispatch for ParachainRuntimeExecutor {69	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;7071	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {72		unique_runtime::api::dispatch(method, data)73	}7475	fn native_version() -> sc_executor::NativeVersion {76		unique_runtime::native_version()77	}78}7980pub fn open_frontier_backend(config: &Configuration) -> Result<Arc<fc_db::Backend<Block>>, String> {81	let config_dir = config82		.base_path83		.as_ref()84		.map(|base_path| base_path.config_dir(config.chain_spec.id()))85		.unwrap_or_else(|| {86			BasePath::from_project("", "", "unique").config_dir(config.chain_spec.id())87		});88	let database_dir = config_dir.join("frontier").join("db");8990	Ok(Arc::new(fc_db::Backend::<Block>::new(91		&fc_db::DatabaseSettings {92			source: fc_db::DatabaseSettingsSrc::RocksDb {93				path: database_dir,94				cache_size: 0,95			},96		},97	)?))98}99100type ExecutorDispatch = ParachainRuntimeExecutor;101102type FullClient =103	sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;104type FullBackend = sc_service::TFullBackend<Block>;105type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;106107/// Starts a `ServiceBuilder` for a full service.108///109/// Use this macro if you don't actually need the full service, but just the builder in order to110/// be able to perform chain operations.111#[allow(clippy::type_complexity)]112pub fn new_partial<BIQ>(113	config: &Configuration,114	build_import_queue: BIQ,115) -> Result<116	PartialComponents<117		FullClient,118		FullBackend,119		FullSelectChain,120		sc_consensus::DefaultImportQueue<Block, FullClient>,121		sc_transaction_pool::FullPool<Block, FullClient>,122		(123			Option<Telemetry>,124			Option<FilterPool>,125			Arc<fc_db::Backend<Block>>,126			Option<TelemetryWorkerHandle>,127			FeeHistoryCache,128		),129	>,130	sc_service::Error,131>132where133	sc_client_api::StateBackendFor<FullBackend, Block>: sp_api::StateBackend<BlakeTwo256>,134	ExecutorDispatch: NativeExecutionDispatch + 'static,135	BIQ: FnOnce(136		Arc<FullClient>,137		&Configuration,138		Option<TelemetryHandle>,139		&TaskManager,140	) -> Result<sc_consensus::DefaultImportQueue<Block, FullClient>, sc_service::Error>,141{142	let _telemetry = config143		.telemetry_endpoints144		.clone()145		.filter(|x| !x.is_empty())146		.map(|endpoints| -> Result<_, sc_telemetry::Error> {147			let worker = TelemetryWorker::new(16)?;148			let telemetry = worker.handle().new_telemetry(endpoints);149			Ok((worker, telemetry))150		})151		.transpose()?;152153	let telemetry = config154		.telemetry_endpoints155		.clone()156		.filter(|x| !x.is_empty())157		.map(|endpoints| -> Result<_, sc_telemetry::Error> {158			let worker = TelemetryWorker::new(16)?;159			let telemetry = worker.handle().new_telemetry(endpoints);160			Ok((worker, telemetry))161		})162		.transpose()?;163164	let executor = NativeElseWasmExecutor::<ExecutorDispatch>::new(165		config.wasm_method,166		config.default_heap_pages,167		config.max_runtime_instances,168		config.runtime_cache_size,169	);170171	let (client, backend, keystore_container, task_manager) =172		sc_service::new_full_parts::<Block, RuntimeApi, _>(173			config,174			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),175			executor,176		)?;177	let client = Arc::new(client);178179	let telemetry_worker_handle = telemetry.as_ref().map(|(worker, _)| worker.handle());180181	let telemetry = telemetry.map(|(worker, telemetry)| {182		task_manager183			.spawn_handle()184			.spawn("telemetry", None, worker.run());185		telemetry186	});187188	let select_chain = sc_consensus::LongestChain::new(backend.clone());189190	let transaction_pool = sc_transaction_pool::BasicPool::new_full(191		config.transaction_pool.clone(),192		config.role.is_authority().into(),193		config.prometheus_registry(),194		task_manager.spawn_essential_handle(),195		client.clone(),196	);197198	let filter_pool: Option<FilterPool> = Some(Arc::new(Mutex::new(BTreeMap::new())));199200	let frontier_backend = open_frontier_backend(config)?;201202	let import_queue = build_import_queue(203		client.clone(),204		config,205		telemetry.as_ref().map(|telemetry| telemetry.handle()),206		&task_manager,207	)?;208	let fee_history_cache: FeeHistoryCache = Arc::new(Mutex::new(BTreeMap::new()));209210	let params = PartialComponents {211		backend,212		client,213		import_queue,214		keystore_container,215		task_manager,216		transaction_pool,217		select_chain,218		other: (219			telemetry,220			filter_pool,221			frontier_backend,222			telemetry_worker_handle,223			fee_history_cache,224		),225	};226227	Ok(params)228}229230/// Start a node with the given parachain `Configuration` and relay chain `Configuration`.231///232/// This is the actual implementation that is abstract over the executor and the runtime api.233#[sc_tracing::logging::prefix_logs_with("Parachain")]234async fn start_node_impl<BIQ, BIC>(235	parachain_config: Configuration,236	polkadot_config: Configuration,237	id: ParaId,238	build_import_queue: BIQ,239	build_consensus: BIC,240) -> sc_service::error::Result<(TaskManager, Arc<FullClient>)>241where242	sc_client_api::StateBackendFor<FullBackend, Block>: sp_api::StateBackend<BlakeTwo256>,243	ExecutorDispatch: NativeExecutionDispatch + 'static,244	BIQ: FnOnce(245		Arc<FullClient>,246		&Configuration,247		Option<TelemetryHandle>,248		&TaskManager,249	) -> Result<sc_consensus::DefaultImportQueue<Block, FullClient>, sc_service::Error>,250	BIC: FnOnce(251		Arc<FullClient>,252		Option<&Registry>,253		Option<TelemetryHandle>,254		&TaskManager,255		Arc<dyn RelayChainInterface>,256		Arc<sc_transaction_pool::FullPool<Block, FullClient>>,257		Arc<NetworkService<Block, Hash>>,258		SyncCryptoStorePtr,259		bool,260	) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error>,261{262	if matches!(parachain_config.role, Role::Light) {263		return Err("Light client not supported!".into());264	}265266	let parachain_config = prepare_node_config(parachain_config);267268	let params = new_partial::<BIQ>(&parachain_config, build_import_queue)?;269	let (mut telemetry, filter_pool, frontier_backend, telemetry_worker_handle, fee_history_cache) =270		params.other;271272	let client = params.client.clone();273	let backend = params.backend.clone();274	let mut task_manager = params.task_manager;275276	let (relay_chain_interface, collator_key) =277		build_relay_chain_interface(polkadot_config, telemetry_worker_handle, &mut task_manager)278			.map_err(|e| match e {279				polkadot_service::Error::Sub(x) => x,280				s => format!("{}", s).into(),281			})?;282283	let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), id);284285	let force_authoring = parachain_config.force_authoring;286	let validator = parachain_config.role.is_authority();287	let prometheus_registry = parachain_config.prometheus_registry().cloned();288	let transaction_pool = params.transaction_pool.clone();289	let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue);290291	let (network, system_rpc_tx, start_network) =292		sc_service::build_network(sc_service::BuildNetworkParams {293			config: &parachain_config,294			client: client.clone(),295			transaction_pool: transaction_pool.clone(),296			spawn_handle: task_manager.spawn_handle(),297			import_queue: import_queue.clone(),298			block_announce_validator_builder: Some(Box::new(|_| {299				Box::new(block_announce_validator)300			})),301			warp_sync: None,302		})?;303304	let subscription_executor = sc_rpc::SubscriptionTaskExecutor::new(task_manager.spawn_handle());305	let rpc_client = client.clone();306	let rpc_pool = transaction_pool.clone();307	let select_chain = params.select_chain.clone();308	let rpc_network = network.clone();309310	let rpc_frontier_backend = frontier_backend.clone();311312	let block_data_cache = Arc::new(fc_rpc::EthBlockDataCache::new(313		task_manager.spawn_handle(),314		overrides_handle(client.clone()),315		50,316		50,317	));318319	let rpc_extensions_builder = Box::new(move |deny_unsafe, _| {320		let full_deps = unique_rpc::FullDeps {321			backend: rpc_frontier_backend.clone(),322			deny_unsafe,323			client: rpc_client.clone(),324			pool: rpc_pool.clone(),325			graph: rpc_pool.pool().clone(),326			// TODO: Unhardcode327			enable_dev_signer: false,328			filter_pool: filter_pool.clone(),329			network: rpc_network.clone(),330			select_chain: select_chain.clone(),331			is_authority: validator,332			// TODO: Unhardcode333			max_past_logs: 10000,334			block_data_cache: block_data_cache.clone(),335			fee_history_cache: fee_history_cache.clone(),336			// TODO: Unhardcode337			fee_history_limit: 2048,338		};339340		Ok(unique_rpc::create_full::<_, _, _, _, RuntimeApi, _>(341			full_deps,342			subscription_executor.clone(),343		))344	});345346	task_manager.spawn_essential_handle().spawn(347		"frontier-mapping-sync-worker",348		None,349		MappingSyncWorker::new(350			client.import_notification_stream(),351			Duration::new(6, 0),352			client.clone(),353			backend.clone(),354			frontier_backend.clone(),355			SyncStrategy::Normal,356		)357		.for_each(|()| futures::future::ready(())),358	);359360	sc_service::spawn_tasks(sc_service::SpawnTasksParams {361		rpc_extensions_builder,362		client: client.clone(),363		transaction_pool: transaction_pool.clone(),364		task_manager: &mut task_manager,365		config: parachain_config,366		keystore: params.keystore_container.sync_keystore(),367		backend: backend.clone(),368		network: network.clone(),369		system_rpc_tx,370		telemetry: telemetry.as_mut(),371	})?;372373	let announce_block = {374		let network = network.clone();375		Arc::new(move |hash, data| network.announce_block(hash, data))376	};377378	let relay_chain_slot_duration = Duration::from_secs(6);379380	if validator {381		let parachain_consensus = build_consensus(382			client.clone(),383			prometheus_registry.as_ref(),384			telemetry.as_ref().map(|t| t.handle()),385			&task_manager,386			relay_chain_interface.clone(),387			transaction_pool,388			network,389			params.keystore_container.sync_keystore(),390			force_authoring,391		)?;392393		let spawner = task_manager.spawn_handle();394395		let params = StartCollatorParams {396			para_id: id,397			block_status: client.clone(),398			announce_block,399			client: client.clone(),400			task_manager: &mut task_manager,401			spawner,402			parachain_consensus,403			import_queue,404			collator_key,405			relay_chain_interface,406			relay_chain_slot_duration,407		};408409		start_collator(params).await?;410	} else {411		let params = StartFullNodeParams {412			client: client.clone(),413			announce_block,414			task_manager: &mut task_manager,415			para_id: id,416			import_queue,417			relay_chain_interface,418			relay_chain_slot_duration,419		};420421		start_full_node(params)?;422	}423424	start_network.start_network();425426	Ok((task_manager, client))427}428429/// Build the import queue for the the parachain runtime.430pub fn parachain_build_import_queue(431	client: Arc<FullClient>,432	config: &Configuration,433	telemetry: Option<TelemetryHandle>,434	task_manager: &TaskManager,435) -> Result<sc_consensus::DefaultImportQueue<Block, FullClient>, sc_service::Error> {436	let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;437438	cumulus_client_consensus_aura::import_queue::<439		sp_consensus_aura::sr25519::AuthorityPair,440		_,441		_,442		_,443		_,444		_,445		_,446	>(cumulus_client_consensus_aura::ImportQueueParams {447		block_import: client.clone(),448		client: client.clone(),449		create_inherent_data_providers: move |_, _| async move {450			let time = sp_timestamp::InherentDataProvider::from_system_time();451452			let slot =453				sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(454					*time,455					slot_duration.slot_duration(),456				);457458			Ok((time, slot))459		},460		registry: config.prometheus_registry(),461		can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),462		spawner: &task_manager.spawn_essential_handle(),463		telemetry,464	})465	.map_err(Into::into)466}467468/// Start a normal parachain node.469pub async fn start_node(470	parachain_config: Configuration,471	polkadot_config: Configuration,472	id: ParaId,473) -> sc_service::error::Result<(TaskManager, Arc<FullClient>)> {474	start_node_impl::<_, _>(475		parachain_config,476		polkadot_config,477		id,478		parachain_build_import_queue,479		|client,480		 prometheus_registry,481		 telemetry,482		 task_manager,483		 relay_chain_interface,484		 transaction_pool,485		 sync_oracle,486		 keystore,487		 force_authoring| {488			let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;489490			let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(491				task_manager.spawn_handle(),492				client.clone(),493				transaction_pool,494				prometheus_registry,495				telemetry.clone(),496			);497498			Ok(AuraConsensus::build::<499				sp_consensus_aura::sr25519::AuthorityPair,500				_,501				_,502				_,503				_,504				_,505				_,506			>(BuildAuraConsensusParams {507				proposer_factory,508				create_inherent_data_providers: move |_, (relay_parent, validation_data)| {509					let relay_chain_interface = relay_chain_interface.clone();510					async move {511						let parachain_inherent =512						cumulus_primitives_parachain_inherent::ParachainInherentData::create_at(513							relay_parent,514							&relay_chain_interface,515							&validation_data,516							id,517						).await;518519						let time = sp_timestamp::InherentDataProvider::from_system_time();520521						let slot =522						sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(523							*time,524							slot_duration.slot_duration(),525						);526527						let parachain_inherent = parachain_inherent.ok_or_else(|| {528							Box::<dyn std::error::Error + Send + Sync>::from(529								"Failed to create parachain inherent",530							)531						})?;532						Ok((time, slot, parachain_inherent))533					}534				},535				block_import: client.clone(),536				para_client: client,537				backoff_authoring_blocks: Option::<()>::None,538				sync_oracle,539				keystore,540				force_authoring,541				slot_duration: *slot_duration,542				// We got around 500ms for proposing543				block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32),544				telemetry,545				max_block_proposal_slot_portion: None,546			}))547		},548	)549	.await550}
after · node/cli/src/service.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! Service and ServiceFactory implementation. Specialized wrapper over substrate service.1819// std20use std::sync::Arc;21use std::sync::Mutex;22use std::collections::BTreeMap;23use std::time::Duration;24use fc_rpc_core::types::FeeHistoryCache;25use futures::StreamExt;2627use unique_rpc::overrides_handle;28// Local Runtime Types29#[cfg(feature = "unique-runtime")]30use unique_runtime as runtime;3132#[cfg(feature = "quartz-runtime")]33use quartz_runtime as runtime;3435#[cfg(feature = "opal-runtime")]36use opal_runtime as runtime;3738use runtime::RuntimeApi;3940// Cumulus Imports41use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion};42use cumulus_client_consensus_common::ParachainConsensus;43use cumulus_client_service::{44	prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams,45};46use cumulus_client_network::BlockAnnounceValidator;47use cumulus_primitives_core::ParaId;48use cumulus_relay_chain_interface::RelayChainInterface;49use cumulus_relay_chain_local::build_relay_chain_interface;5051// Substrate Imports52use sc_client_api::ExecutorProvider;53use sc_executor::NativeElseWasmExecutor;54use sc_executor::NativeExecutionDispatch;55use sc_network::NetworkService;56use sc_service::{BasePath, Configuration, PartialComponents, Role, TaskManager};57use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};58use sp_consensus::SlotData;59use sp_keystore::SyncCryptoStorePtr;60use sp_runtime::traits::BlakeTwo256;61use substrate_prometheus_endpoint::Registry;62use sc_client_api::BlockchainEvents;6364// Frontier Imports65use fc_rpc_core::types::FilterPool;66use fc_mapping_sync::{MappingSyncWorker, SyncStrategy};6768// Runtime type overrides69type BlockNumber = u32;70type Header = sp_runtime::generic::Header<BlockNumber, sp_runtime::traits::BlakeTwo256>;71pub type Block = sp_runtime::generic::Block<Header, sp_runtime::OpaqueExtrinsic>;72type Hash = sp_core::H256;7374/// Native executor instance.75pub struct ParachainRuntimeExecutor;7677impl NativeExecutionDispatch for ParachainRuntimeExecutor {78	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;7980	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {81		runtime::api::dispatch(method, data)82	}8384	fn native_version() -> sc_executor::NativeVersion {85		runtime::native_version()86	}87}8889pub fn open_frontier_backend(config: &Configuration) -> Result<Arc<fc_db::Backend<Block>>, String> {90	let config_dir = config91		.base_path92		.as_ref()93		.map(|base_path| base_path.config_dir(config.chain_spec.id()))94		.unwrap_or_else(|| {95			BasePath::from_project("", "", "unique").config_dir(config.chain_spec.id())96		});97	let database_dir = config_dir.join("frontier").join("db");9899	Ok(Arc::new(fc_db::Backend::<Block>::new(100		&fc_db::DatabaseSettings {101			source: fc_db::DatabaseSettingsSrc::RocksDb {102				path: database_dir,103				cache_size: 0,104			},105		},106	)?))107}108109type ExecutorDispatch = ParachainRuntimeExecutor;110111type FullClient =112	sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;113type FullBackend = sc_service::TFullBackend<Block>;114type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;115116/// Starts a `ServiceBuilder` for a full service.117///118/// Use this macro if you don't actually need the full service, but just the builder in order to119/// be able to perform chain operations.120#[allow(clippy::type_complexity)]121pub fn new_partial<BIQ>(122	config: &Configuration,123	build_import_queue: BIQ,124) -> Result<125	PartialComponents<126		FullClient,127		FullBackend,128		FullSelectChain,129		sc_consensus::DefaultImportQueue<Block, FullClient>,130		sc_transaction_pool::FullPool<Block, FullClient>,131		(132			Option<Telemetry>,133			Option<FilterPool>,134			Arc<fc_db::Backend<Block>>,135			Option<TelemetryWorkerHandle>,136			FeeHistoryCache,137		),138	>,139	sc_service::Error,140>141where142	sc_client_api::StateBackendFor<FullBackend, Block>: sp_api::StateBackend<BlakeTwo256>,143	ExecutorDispatch: NativeExecutionDispatch + 'static,144	BIQ: FnOnce(145		Arc<FullClient>,146		&Configuration,147		Option<TelemetryHandle>,148		&TaskManager,149	) -> Result<sc_consensus::DefaultImportQueue<Block, FullClient>, sc_service::Error>,150{151	let _telemetry = config152		.telemetry_endpoints153		.clone()154		.filter(|x| !x.is_empty())155		.map(|endpoints| -> Result<_, sc_telemetry::Error> {156			let worker = TelemetryWorker::new(16)?;157			let telemetry = worker.handle().new_telemetry(endpoints);158			Ok((worker, telemetry))159		})160		.transpose()?;161162	let telemetry = config163		.telemetry_endpoints164		.clone()165		.filter(|x| !x.is_empty())166		.map(|endpoints| -> Result<_, sc_telemetry::Error> {167			let worker = TelemetryWorker::new(16)?;168			let telemetry = worker.handle().new_telemetry(endpoints);169			Ok((worker, telemetry))170		})171		.transpose()?;172173	let executor = NativeElseWasmExecutor::<ExecutorDispatch>::new(174		config.wasm_method,175		config.default_heap_pages,176		config.max_runtime_instances,177		config.runtime_cache_size,178	);179180	let (client, backend, keystore_container, task_manager) =181		sc_service::new_full_parts::<Block, RuntimeApi, _>(182			config,183			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),184			executor,185		)?;186	let client = Arc::new(client);187188	let telemetry_worker_handle = telemetry.as_ref().map(|(worker, _)| worker.handle());189190	let telemetry = telemetry.map(|(worker, telemetry)| {191		task_manager192			.spawn_handle()193			.spawn("telemetry", None, worker.run());194		telemetry195	});196197	let select_chain = sc_consensus::LongestChain::new(backend.clone());198199	let transaction_pool = sc_transaction_pool::BasicPool::new_full(200		config.transaction_pool.clone(),201		config.role.is_authority().into(),202		config.prometheus_registry(),203		task_manager.spawn_essential_handle(),204		client.clone(),205	);206207	let filter_pool: Option<FilterPool> = Some(Arc::new(Mutex::new(BTreeMap::new())));208209	let frontier_backend = open_frontier_backend(config)?;210211	let import_queue = build_import_queue(212		client.clone(),213		config,214		telemetry.as_ref().map(|telemetry| telemetry.handle()),215		&task_manager,216	)?;217	let fee_history_cache: FeeHistoryCache = Arc::new(Mutex::new(BTreeMap::new()));218219	let params = PartialComponents {220		backend,221		client,222		import_queue,223		keystore_container,224		task_manager,225		transaction_pool,226		select_chain,227		other: (228			telemetry,229			filter_pool,230			frontier_backend,231			telemetry_worker_handle,232			fee_history_cache,233		),234	};235236	Ok(params)237}238239/// Start a node with the given parachain `Configuration` and relay chain `Configuration`.240///241/// This is the actual implementation that is abstract over the executor and the runtime api.242#[sc_tracing::logging::prefix_logs_with("Parachain")]243async fn start_node_impl<BIQ, BIC>(244	parachain_config: Configuration,245	polkadot_config: Configuration,246	id: ParaId,247	build_import_queue: BIQ,248	build_consensus: BIC,249) -> sc_service::error::Result<(TaskManager, Arc<FullClient>)>250where251	sc_client_api::StateBackendFor<FullBackend, Block>: sp_api::StateBackend<BlakeTwo256>,252	ExecutorDispatch: NativeExecutionDispatch + 'static,253	BIQ: FnOnce(254		Arc<FullClient>,255		&Configuration,256		Option<TelemetryHandle>,257		&TaskManager,258	) -> Result<sc_consensus::DefaultImportQueue<Block, FullClient>, sc_service::Error>,259	BIC: FnOnce(260		Arc<FullClient>,261		Option<&Registry>,262		Option<TelemetryHandle>,263		&TaskManager,264		Arc<dyn RelayChainInterface>,265		Arc<sc_transaction_pool::FullPool<Block, FullClient>>,266		Arc<NetworkService<Block, Hash>>,267		SyncCryptoStorePtr,268		bool,269	) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error>,270{271	if matches!(parachain_config.role, Role::Light) {272		return Err("Light client not supported!".into());273	}274275	let parachain_config = prepare_node_config(parachain_config);276277	let params = new_partial::<BIQ>(&parachain_config, build_import_queue)?;278	let (mut telemetry, filter_pool, frontier_backend, telemetry_worker_handle, fee_history_cache) =279		params.other;280281	let client = params.client.clone();282	let backend = params.backend.clone();283	let mut task_manager = params.task_manager;284285	let (relay_chain_interface, collator_key) =286		build_relay_chain_interface(polkadot_config, telemetry_worker_handle, &mut task_manager)287			.map_err(|e| match e {288				polkadot_service::Error::Sub(x) => x,289				s => format!("{}", s).into(),290			})?;291292	let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), id);293294	let force_authoring = parachain_config.force_authoring;295	let validator = parachain_config.role.is_authority();296	let prometheus_registry = parachain_config.prometheus_registry().cloned();297	let transaction_pool = params.transaction_pool.clone();298	let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue);299300	let (network, system_rpc_tx, start_network) =301		sc_service::build_network(sc_service::BuildNetworkParams {302			config: &parachain_config,303			client: client.clone(),304			transaction_pool: transaction_pool.clone(),305			spawn_handle: task_manager.spawn_handle(),306			import_queue: import_queue.clone(),307			block_announce_validator_builder: Some(Box::new(|_| {308				Box::new(block_announce_validator)309			})),310			warp_sync: None,311		})?;312313	let subscription_executor = sc_rpc::SubscriptionTaskExecutor::new(task_manager.spawn_handle());314	let rpc_client = client.clone();315	let rpc_pool = transaction_pool.clone();316	let select_chain = params.select_chain.clone();317	let rpc_network = network.clone();318319	let rpc_frontier_backend = frontier_backend.clone();320321	let block_data_cache = Arc::new(fc_rpc::EthBlockDataCache::new(322		task_manager.spawn_handle(),323		overrides_handle(client.clone()),324		50,325		50,326	));327328	let rpc_extensions_builder = Box::new(move |deny_unsafe, _| {329		let full_deps = unique_rpc::FullDeps {330			backend: rpc_frontier_backend.clone(),331			deny_unsafe,332			client: rpc_client.clone(),333			pool: rpc_pool.clone(),334			graph: rpc_pool.pool().clone(),335			// TODO: Unhardcode336			enable_dev_signer: false,337			filter_pool: filter_pool.clone(),338			network: rpc_network.clone(),339			select_chain: select_chain.clone(),340			is_authority: validator,341			// TODO: Unhardcode342			max_past_logs: 10000,343			block_data_cache: block_data_cache.clone(),344			fee_history_cache: fee_history_cache.clone(),345			// TODO: Unhardcode346			fee_history_limit: 2048,347		};348349		Ok(unique_rpc::create_full::<_, _, _, _, RuntimeApi, _>(350			full_deps,351			subscription_executor.clone(),352		))353	});354355	task_manager.spawn_essential_handle().spawn(356		"frontier-mapping-sync-worker",357		None,358		MappingSyncWorker::new(359			client.import_notification_stream(),360			Duration::new(6, 0),361			client.clone(),362			backend.clone(),363			frontier_backend.clone(),364			SyncStrategy::Normal,365		)366		.for_each(|()| futures::future::ready(())),367	);368369	sc_service::spawn_tasks(sc_service::SpawnTasksParams {370		rpc_extensions_builder,371		client: client.clone(),372		transaction_pool: transaction_pool.clone(),373		task_manager: &mut task_manager,374		config: parachain_config,375		keystore: params.keystore_container.sync_keystore(),376		backend: backend.clone(),377		network: network.clone(),378		system_rpc_tx,379		telemetry: telemetry.as_mut(),380	})?;381382	let announce_block = {383		let network = network.clone();384		Arc::new(move |hash, data| network.announce_block(hash, data))385	};386387	let relay_chain_slot_duration = Duration::from_secs(6);388389	if validator {390		let parachain_consensus = build_consensus(391			client.clone(),392			prometheus_registry.as_ref(),393			telemetry.as_ref().map(|t| t.handle()),394			&task_manager,395			relay_chain_interface.clone(),396			transaction_pool,397			network,398			params.keystore_container.sync_keystore(),399			force_authoring,400		)?;401402		let spawner = task_manager.spawn_handle();403404		let params = StartCollatorParams {405			para_id: id,406			block_status: client.clone(),407			announce_block,408			client: client.clone(),409			task_manager: &mut task_manager,410			spawner,411			parachain_consensus,412			import_queue,413			collator_key,414			relay_chain_interface,415			relay_chain_slot_duration,416		};417418		start_collator(params).await?;419	} else {420		let params = StartFullNodeParams {421			client: client.clone(),422			announce_block,423			task_manager: &mut task_manager,424			para_id: id,425			import_queue,426			relay_chain_interface,427			relay_chain_slot_duration,428		};429430		start_full_node(params)?;431	}432433	start_network.start_network();434435	Ok((task_manager, client))436}437438/// Build the import queue for the the parachain runtime.439pub fn parachain_build_import_queue(440	client: Arc<FullClient>,441	config: &Configuration,442	telemetry: Option<TelemetryHandle>,443	task_manager: &TaskManager,444) -> Result<sc_consensus::DefaultImportQueue<Block, FullClient>, sc_service::Error> {445	let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;446447	cumulus_client_consensus_aura::import_queue::<448		sp_consensus_aura::sr25519::AuthorityPair,449		_,450		_,451		_,452		_,453		_,454		_,455	>(cumulus_client_consensus_aura::ImportQueueParams {456		block_import: client.clone(),457		client: client.clone(),458		create_inherent_data_providers: move |_, _| async move {459			let time = sp_timestamp::InherentDataProvider::from_system_time();460461			let slot =462				sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(463					*time,464					slot_duration.slot_duration(),465				);466467			Ok((time, slot))468		},469		registry: config.prometheus_registry(),470		can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),471		spawner: &task_manager.spawn_essential_handle(),472		telemetry,473	})474	.map_err(Into::into)475}476477/// Start a normal parachain node.478pub async fn start_node(479	parachain_config: Configuration,480	polkadot_config: Configuration,481	id: ParaId,482) -> sc_service::error::Result<(TaskManager, Arc<FullClient>)> {483	start_node_impl::<_, _>(484		parachain_config,485		polkadot_config,486		id,487		parachain_build_import_queue,488		|client,489		 prometheus_registry,490		 telemetry,491		 task_manager,492		 relay_chain_interface,493		 transaction_pool,494		 sync_oracle,495		 keystore,496		 force_authoring| {497			let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;498499			let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(500				task_manager.spawn_handle(),501				client.clone(),502				transaction_pool,503				prometheus_registry,504				telemetry.clone(),505			);506507			Ok(AuraConsensus::build::<508				sp_consensus_aura::sr25519::AuthorityPair,509				_,510				_,511				_,512				_,513				_,514				_,515			>(BuildAuraConsensusParams {516				proposer_factory,517				create_inherent_data_providers: move |_, (relay_parent, validation_data)| {518					let relay_chain_interface = relay_chain_interface.clone();519					async move {520						let parachain_inherent =521						cumulus_primitives_parachain_inherent::ParachainInherentData::create_at(522							relay_parent,523							&relay_chain_interface,524							&validation_data,525							id,526						).await;527528						let time = sp_timestamp::InherentDataProvider::from_system_time();529530						let slot =531						sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(532							*time,533							slot_duration.slot_duration(),534						);535536						let parachain_inherent = parachain_inherent.ok_or_else(|| {537							Box::<dyn std::error::Error + Send + Sync>::from(538								"Failed to create parachain inherent",539							)540						})?;541						Ok((time, slot, parachain_inherent))542					}543				},544				block_import: client.clone(),545				para_client: client,546				backoff_authoring_blocks: Option::<()>::None,547				sync_oracle,548				keystore,549				force_authoring,550				slot_duration: *slot_duration,551				// We got around 500ms for proposing552				block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32),553				telemetry,554				max_block_proposal_slot_portion: None,555			}))556		},557	)558	.await559}
modifiednode/rpc/Cargo.tomldiffbeforeafterboth
--- a/node/rpc/Cargo.toml
+++ b/node/rpc/Cargo.toml
@@ -51,7 +51,10 @@
 pallet-unique = { path = "../../pallets/unique" }
 uc-rpc = { path = "../../client/rpc" }
 up-rpc = { path = "../../primitives/rpc" }
-unique-runtime = { path = "../../runtime" }
+unique-runtime = { path = "../../runtime/unique", optional = true }
+quartz-runtime = { path = "../../runtime/quartz", optional = true }
+opal-runtime = { path = "../../runtime/opal", optional = true }
 
 [features]
+default = ["unique-runtime"]
 std = []
modifiednode/rpc/src/lib.rsdiffbeforeafterboth
--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -15,7 +15,6 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 use sp_runtime::traits::BlakeTwo256;
-use unique_runtime::{Hash, AccountId, CrossAccountId, Index, opaque::Block, BlockNumber, Balance};
 use fc_rpc::{
 	EthBlockDataCache, OverrideHandle, RuntimeApiStorageOverride, SchemaV1Override,
 	StorageOverride, SchemaV2Override, SchemaV3Override,
@@ -41,6 +40,17 @@
 use sc_service::TransactionPool;
 use std::{collections::BTreeMap, marker::PhantomData, sync::Arc};
 
+#[cfg(feature = "unique-runtime")]
+use unique_runtime as runtime;
+
+#[cfg(feature = "quartz-runtime")]
+use quartz_runtime as runtime;
+
+#[cfg(feature = "opal-runtime")]
+use opal_runtime as runtime;
+
+use runtime::opaque::{Hash, AccountId, CrossAccountId, Index, Block, BlockNumber, Balance};
+
 /// Public io handler for exporting into other modules
 pub type IoHandler = jsonrpc_core::IoHandler<sc_rpc::Metadata>;
 
@@ -231,7 +241,7 @@
 		client.clone(),
 		pool.clone(),
 		graph,
-		unique_runtime::TransactionConverter,
+		runtime::TransactionConverter,
 		network.clone(),
 		signers,
 		overrides.clone(),