`9029637fc63d`

3 files changed

modifiednode/cli/src/chain_spec.rsdiff before after both

216	)216	)
217}217}
218
219pub fn local_testnet_westend_config() -> OpalChainSpec {
220	OpalChainSpec::from_genesis(
221		// Name
222		"Local Testnet",
223		// ID
224		"local_testnet",
225		ChainType::Local,
226		move || {
227			testnet_genesis(
228				// Sudo account
229				get_account_id_from_seed::<sr25519::Public>("Alice"),
230				vec![
231					get_from_seed::<AuraId>("Alice"),
232					get_from_seed::<AuraId>("Bob"),
233					get_from_seed::<AuraId>("Charlie"),
234					get_from_seed::<AuraId>("Dave"),
235					get_from_seed::<AuraId>("Eve"),
236				],
237				// Pre-funded accounts
238				vec![
239					get_account_id_from_seed::<sr25519::Public>("Alice"),
240					get_account_id_from_seed::<sr25519::Public>("Bob"),
241					get_account_id_from_seed::<sr25519::Public>("Charlie"),
242					get_account_id_from_seed::<sr25519::Public>("Dave"),
243					get_account_id_from_seed::<sr25519::Public>("Eve"),
244					get_account_id_from_seed::<sr25519::Public>("Ferdie"),
245					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
246					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
247					get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
248					get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
249					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
250					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
251				],
252				1000.into(),
253			)
254		},
255		// Bootnodes
256		vec![],
257		// Telemetry
258		None,
259		// Protocol ID
260		None,
261		None,
262		// Properties
263		None,
264		// Extensions
265		Extensions {
266			relay_chain: "westend-local".into(),
267			para_id: 1000,
268		},
269	)
270}
271218
272fn testnet_genesis(219fn testnet_genesis(
273	root_key: AccountId,220	root_key: AccountId,

modifiednode/cli/src/command.rsdiff before after both

7575
76fn load_spec(id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {76fn load_spec(id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
77	Ok(match id {77	Ok(match id {
78		"westend-local" => Box::new(chain_spec::local_testnet_westend_config()),
79		"rococo-local" => Box::new(chain_spec::local_testnet_rococo_config()),
80		"dev" => Box::new(chain_spec::development_config()),78		"dev" => Box::new(chain_spec::development_config()),
81		"" | "local" => Box::new(chain_spec::local_testnet_rococo_config()),79		"" | "local" => Box::new(chain_spec::local_testnet_rococo_config()),
82		path => {80		path => {
402					|| relay_chain_id == Some("dev-service".into());400					|| relay_chain_id == Some("dev-service".into());
403401
404				if is_dev_service {402				if is_dev_service {
403					info!("Running Dev service");
404
405					return start_node_using_chain_runtime! {405					return start_node_using_chain_runtime! {
406						start_dev_node(config).map_err(Into::into)406						start_dev_node(config).map_err(Into::into)

modifiednode/cli/src/service.rsdiff before after both

126	sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;126	sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;
127type FullBackend = sc_service::TFullBackend<Block>;127type FullBackend = sc_service::TFullBackend<Block>;
128type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;128type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;
129type MaybeSelectChain = Option<FullSelectChain>;
130129
131/// Starts a `ServiceBuilder` for a full service.130/// Starts a `ServiceBuilder` for a full service.
132///131///
141	PartialComponents<140	PartialComponents<
142		FullClient<RuntimeApi, ExecutorDispatch>,141		FullClient<RuntimeApi, ExecutorDispatch>,
143		FullBackend,142		FullBackend,
144		MaybeSelectChain,143		FullSelectChain,
145		sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, ExecutorDispatch>>,144		sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, ExecutorDispatch>>,
146		sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, ExecutorDispatch>>,145		sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, ExecutorDispatch>>,
147		(146		(
218		telemetry217		telemetry
219	});218	});
220219
221	let select_chain = match service_id {220	let select_chain = sc_consensus::LongestChain::new(backend.clone());
222		ServiceId::Prod => Some(sc_consensus::LongestChain::new(backend.clone())),
223		ServiceId::Dev => None,
224	};
225221
226	let transaction_pool = sc_transaction_pool::BasicPool::new_full(222	let transaction_pool = sc_transaction_pool::BasicPool::new_full(
227		config.transaction_pool.clone(),223		config.transaction_pool.clone(),
367	let rpc_pool = transaction_pool.clone();363	let rpc_pool = transaction_pool.clone();
368	let select_chain = params364	let select_chain = params
369		.select_chain365		.select_chain
370		.expect("select_chain always exists when running Prod service; qed")
371		.clone();366		.clone();
372	let rpc_network = network.clone();367	let rpc_network = network.clone();
373368
754	let prometheus_registry = config.prometheus_registry().cloned();749	let prometheus_registry = config.prometheus_registry().cloned();
755	let collator = config.role.is_authority();750	let collator = config.role.is_authority();
756751
757	let select_chain = maybe_select_chain.clone().expect(752	let select_chain = maybe_select_chain.clone();
758		"`new_partial` builds a `LongestChainRule` when building dev service.\
759			We specified the dev service when calling `new_partial`.\
760			Therefore, a `LongestChainRule` is present. qed.",
761	);
762753
763	if collator {754	if collator {
764		let block_import =755		let block_import =