difftreelog
Autoseal after idle n seconds
in: master
4 files changed
node/cli/Cargo.tomldiffbeforeafterboth--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -294,6 +294,7 @@
[dependencies]
futures = '0.3.17'
+futures-timer = '3.0.2'
log = '0.4.14'
flexi_logger = "0.15.7"
parking_lot = '0.11.2'
node/cli/src/cli.rsdiffbeforeafterboth--- a/node/cli/src/cli.rs
+++ b/node/cli/src/cli.rs
@@ -104,6 +104,15 @@
#[structopt(flatten)]
pub run: cumulus_client_cli::RunCmd,
+ /// When running the node in the `--dev` mode and
+ /// there is no transaction in the transaction pool,
+ /// an empty block will be sealed automatically
+ /// after the `--idle-autoseal-interval` milliseconds.
+ ///
+ /// Default interval is 500 milliseconds
+ #[structopt(default_value = "500", long)]
+ pub idle_autoseal_interval: u64,
+
/// Relaychain arguments
#[structopt(raw = true)]
pub relaychain_args: Vec<String>,
node/cli/src/command.rsdiffbeforeafterboth1// 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// Original license18// This file is part of Substrate.1920// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.21// SPDX-License-Identifier: Apache-2.02223// Licensed under the Apache License, Version 2.0 (the "License");24// you may not use this file except in compliance with the License.25// You may obtain a copy of the License at26//27// http://www.apache.org/licenses/LICENSE-2.028//29// Unless required by applicable law or agreed to in writing, software30// distributed under the License is distributed on an "AS IS" BASIS,31// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.32// See the License for the specific language governing permissions and33// limitations under the License.3435use crate::{36 chain_spec::{self, RuntimeId, RuntimeIdentification, ServiceId, ServiceIdentification},37 cli::{Cli, RelayChainCli, Subcommand},38 service::{new_partial, start_node, start_dev_node},39};4041#[cfg(feature = "unique-runtime")]42use crate::service::UniqueRuntimeExecutor;4344#[cfg(feature = "quartz-runtime")]45use crate::service::QuartzRuntimeExecutor;4647use crate::service::OpalRuntimeExecutor;4849use codec::Encode;50use cumulus_primitives_core::ParaId;51use cumulus_client_service::genesis::generate_genesis_block;52use log::info;53use polkadot_parachain::primitives::AccountIdConversion;54use sc_cli::{55 ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,56 NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli,57};58use sc_service::{59 config::{BasePath, PrometheusConfig},60};61use sp_core::hexdisplay::HexDisplay;62use sp_runtime::traits::Block as BlockT;63use std::{io::Write, net::SocketAddr};6465use unique_runtime_common::types::Block;6667macro_rules! no_runtime_err {68 ($chain_name:expr) => {69 format!(70 "No runtime valid runtime was found for chain {}",71 $chain_name72 )73 };74}7576fn load_spec(id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {77 Ok(match id {78 "dev" => Box::new(chain_spec::development_config()),79 "" | "local" => Box::new(chain_spec::local_testnet_rococo_config()),80 path => {81 let path = std::path::PathBuf::from(path);82 let chain_spec = Box::new(chain_spec::OpalChainSpec::from_json_file(path.clone())?)83 as Box<dyn sc_service::ChainSpec>;8485 match chain_spec.runtime_id() {86 #[cfg(feature = "unique-runtime")]87 RuntimeId::Unique => Box::new(chain_spec::UniqueChainSpec::from_json_file(path)?),8889 #[cfg(feature = "quartz-runtime")]90 RuntimeId::Quartz => Box::new(chain_spec::QuartzChainSpec::from_json_file(path)?),9192 RuntimeId::Opal => chain_spec,93 RuntimeId::Unknown(chain) => return Err(no_runtime_err!(chain)),94 }95 }96 })97}9899impl SubstrateCli for Cli {100 // TODO use args101 fn impl_name() -> String {102 format!("{} Node", Self::node_name())103 }104105 fn impl_version() -> String {106 env!("SUBSTRATE_CLI_IMPL_VERSION").into()107 }108 // TODO use args109 fn description() -> String {110 format!(111 "{} Node\n\nThe command-line arguments provided first will be \112 passed to the parachain node, while the arguments provided after -- will be passed \113 to the relaychain node.\n\n\114 {} [parachain-args] -- [relaychain-args]",115 Self::node_name(),116 Self::executable_name()117 )118 }119120 fn author() -> String {121 env!("CARGO_PKG_AUTHORS").into()122 }123124 //TODO use args125 fn support_url() -> String {126 "support@unique.network".into()127 }128129 fn copyright_start_year() -> i32 {130 2019131 }132133 fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {134 load_spec(id)135 }136137 fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {138 match chain_spec.runtime_id() {139 #[cfg(feature = "unique-runtime")]140 RuntimeId::Unique => &unique_runtime::VERSION,141142 #[cfg(feature = "quartz-runtime")]143 RuntimeId::Quartz => &quartz_runtime::VERSION,144145 RuntimeId::Opal => &opal_runtime::VERSION,146 RuntimeId::Unknown(chain) => panic!("{}", no_runtime_err!(chain)),147 }148 }149}150151impl SubstrateCli for RelayChainCli {152 // TODO use args153 fn impl_name() -> String {154 format!("{} Node", Cli::node_name())155 }156157 fn impl_version() -> String {158 env!("SUBSTRATE_CLI_IMPL_VERSION").into()159 }160 // TODO use args161 fn description() -> String {162 format!(163 "{} Node\n\nThe command-line arguments provided first will be \164 passed to the parachain node, while the arguments provided after -- will be passed \165 to the relaychain node.\n\n\166 parachain-collator [parachain-args] -- [relaychain-args]",167 Cli::node_name()168 )169 }170171 fn author() -> String {172 env!("CARGO_PKG_AUTHORS").into()173 }174 // TODO use args175 fn support_url() -> String {176 "support@unique.network".into()177 }178179 fn copyright_start_year() -> i32 {180 2019181 }182183 fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {184 polkadot_cli::Cli::from_iter([RelayChainCli::executable_name()].iter()).load_spec(id)185 }186187 fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {188 polkadot_cli::Cli::native_runtime_version(chain_spec)189 }190}191192#[allow(clippy::borrowed_box)]193fn extract_genesis_wasm(chain_spec: &Box<dyn sc_service::ChainSpec>) -> Result<Vec<u8>> {194 let mut storage = chain_spec.build_storage()?;195196 storage197 .top198 .remove(sp_core::storage::well_known_keys::CODE)199 .ok_or_else(|| "Could not find wasm file in genesis state!".into())200}201202macro_rules! async_run_with_runtime {203 (204 $runtime_api:path, $executor:path,205 $runner:ident, $components:ident, $cli:ident, $cmd:ident, $config:ident,206 $( $code:tt )*207 ) => {208 $runner.async_run(|$config| {209 let $components = new_partial::<210 $runtime_api, $executor, _211 >(212 &$config,213 crate::service::parachain_build_import_queue,214 )?;215 let task_manager = $components.task_manager;216217 { $( $code )* }.map(|v| (v, task_manager))218 })219 };220}221222macro_rules! construct_async_run {223 (|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{224 let runner = $cli.create_runner($cmd)?;225226 match runner.config().chain_spec.runtime_id() {227 #[cfg(feature = "unique-runtime")]228 RuntimeId::Unique => async_run_with_runtime!(229 unique_runtime::RuntimeApi, UniqueRuntimeExecutor,230 runner, $components, $cli, $cmd, $config, $( $code )*231 ),232233 #[cfg(feature = "quartz-runtime")]234 RuntimeId::Quartz => async_run_with_runtime!(235 quartz_runtime::RuntimeApi, QuartzRuntimeExecutor,236 runner, $components, $cli, $cmd, $config, $( $code )*237 ),238239 RuntimeId::Opal => async_run_with_runtime!(240 opal_runtime::RuntimeApi, OpalRuntimeExecutor,241 runner, $components, $cli, $cmd, $config, $( $code )*242 ),243244 RuntimeId::Unknown(chain) => Err(no_runtime_err!(chain).into())245 }246 }}247}248249macro_rules! start_node_using_chain_runtime {250 ($start_node_fn:ident($config:expr $(, $($args:expr),+)?) $($code:tt)*) => {251 match $config.chain_spec.runtime_id() {252 #[cfg(feature = "unique-runtime")]253 RuntimeId::Unique => $start_node_fn::<254 unique_runtime::Runtime,255 unique_runtime::RuntimeApi,256 UniqueRuntimeExecutor,257 >($config $(, $($args),+)?) $($code)*,258259 #[cfg(feature = "quartz-runtime")]260 RuntimeId::Quartz => $start_node_fn::<261 quartz_runtime::Runtime,262 quartz_runtime::RuntimeApi,263 QuartzRuntimeExecutor,264 >($config $(, $($args),+)?) $($code)*,265266 RuntimeId::Opal => $start_node_fn::<267 opal_runtime::Runtime,268 opal_runtime::RuntimeApi,269 OpalRuntimeExecutor,270 >($config $(, $($args),+)?) $($code)*,271272 RuntimeId::Unknown(chain) => Err(no_runtime_err!(chain).into()),273 }274 };275}276277/// Parse command line arguments into service configuration.278pub fn run() -> Result<()> {279 let cli = Cli::from_args();280281 match &cli.subcommand {282 Some(Subcommand::BuildSpec(cmd)) => {283 let runner = cli.create_runner(cmd)?;284 runner.sync_run(|config| cmd.run(config.chain_spec, config.network))285 }286 Some(Subcommand::CheckBlock(cmd)) => {287 construct_async_run!(|components, cli, cmd, config| {288 Ok(cmd.run(components.client, components.import_queue))289 })290 }291 Some(Subcommand::ExportBlocks(cmd)) => {292 construct_async_run!(|components, cli, cmd, config| {293 Ok(cmd.run(components.client, config.database))294 })295 }296 Some(Subcommand::ExportState(cmd)) => {297 construct_async_run!(|components, cli, cmd, config| {298 Ok(cmd.run(components.client, config.chain_spec))299 })300 }301 Some(Subcommand::ImportBlocks(cmd)) => {302 construct_async_run!(|components, cli, cmd, config| {303 Ok(cmd.run(components.client, components.import_queue))304 })305 }306 Some(Subcommand::PurgeChain(cmd)) => {307 let runner = cli.create_runner(cmd)?;308309 runner.sync_run(|config| {310 let polkadot_cli = RelayChainCli::new(311 &config,312 [RelayChainCli::executable_name()]313 .iter()314 .chain(cli.relaychain_args.iter()),315 );316317 let polkadot_config = SubstrateCli::create_configuration(318 &polkadot_cli,319 &polkadot_cli,320 config.tokio_handle.clone(),321 )322 .map_err(|err| format!("Relay chain argument error: {}", err))?;323324 cmd.run(config, polkadot_config)325 })326 }327 Some(Subcommand::Revert(cmd)) => construct_async_run!(|components, cli, cmd, config| {328 Ok(cmd.run(components.client, components.backend))329 }),330 Some(Subcommand::ExportGenesisState(params)) => {331 let mut builder = sc_cli::LoggerBuilder::new("");332 builder.with_profiling(sc_tracing::TracingReceiver::Log, "");333 let _ = builder.init();334335 let spec = load_spec(¶ms.chain.clone().unwrap_or_default())?;336 let state_version = Cli::native_runtime_version(&spec).state_version();337 let block: Block = generate_genesis_block(&spec, state_version)?;338 let raw_header = block.header().encode();339 let output_buf = if params.raw {340 raw_header341 } else {342 format!("0x{:?}", HexDisplay::from(&block.header().encode())).into_bytes()343 };344345 if let Some(output) = ¶ms.output {346 std::fs::write(output, output_buf)?;347 } else {348 std::io::stdout().write_all(&output_buf)?;349 }350351 Ok(())352 }353 Some(Subcommand::ExportGenesisWasm(params)) => {354 let mut builder = sc_cli::LoggerBuilder::new("");355 builder.with_profiling(sc_tracing::TracingReceiver::Log, "");356 let _ = builder.init();357358 let raw_wasm_blob =359 extract_genesis_wasm(&cli.load_spec(¶ms.chain.clone().unwrap_or_default())?)?;360 let output_buf = if params.raw {361 raw_wasm_blob362 } else {363 format!("0x{:?}", HexDisplay::from(&raw_wasm_blob)).into_bytes()364 };365366 if let Some(output) = ¶ms.output {367 std::fs::write(output, output_buf)?;368 } else {369 std::io::stdout().write_all(&output_buf)?;370 }371372 Ok(())373 }374 Some(Subcommand::Benchmark(cmd)) => {375 if cfg!(feature = "runtime-benchmarks") {376 let runner = cli.create_runner(cmd)?;377 runner.sync_run(|config| match config.chain_spec.runtime_id() {378 #[cfg(feature = "unique-runtime")]379 RuntimeId::Unique => cmd.run::<Block, UniqueRuntimeExecutor>(config),380381 #[cfg(feature = "quartz-runtime")]382 RuntimeId::Quartz => cmd.run::<Block, QuartzRuntimeExecutor>(config),383384 RuntimeId::Opal => cmd.run::<Block, OpalRuntimeExecutor>(config),385 RuntimeId::Unknown(chain) => Err(no_runtime_err!(chain).into()),386 })387 } else {388 Err("Benchmarking wasn't enabled when building the node. \389 You can enable it with `--features runtime-benchmarks`."390 .into())391 }392 }393 None => {394 let runner = cli.create_runner(&cli.run.normalize())?;395 let collator_options = cli.run.collator_options();396397 runner.run_node_until_exit(|config| async move {398 let extensions = chain_spec::Extensions::try_get(&*config.chain_spec);399400 let service_id = config.chain_spec.service_id();401 let relay_chain_id = extensions.map(|e| e.relay_chain.clone());402 let is_dev_service = matches![service_id, ServiceId::Dev]403 || relay_chain_id == Some("dev-service".into());404405 if is_dev_service {406 info!("Running Dev service");407408 return start_node_using_chain_runtime! {409 start_dev_node(config).map_err(Into::into)410 };411 };412413 let para_id = extensions414 .map(|e| e.para_id)415 .ok_or("Could not find parachain ID in chain-spec.")?;416417 let polkadot_cli = RelayChainCli::new(418 &config,419 [RelayChainCli::executable_name()]420 .iter()421 .chain(cli.relaychain_args.iter()),422 );423424 let para_id = ParaId::from(para_id);425426 let parachain_account =427 AccountIdConversion::<polkadot_primitives::v0::AccountId>::into_account(428 ¶_id,429 );430431 let state_version =432 RelayChainCli::native_runtime_version(&config.chain_spec).state_version();433 let block: Block = generate_genesis_block(&config.chain_spec, state_version)434 .map_err(|e| format!("{:?}", e))?;435 let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));436 let genesis_hash = format!("0x{:?}", HexDisplay::from(&block.header().hash().0));437438 let polkadot_config = SubstrateCli::create_configuration(439 &polkadot_cli,440 &polkadot_cli,441 config.tokio_handle.clone(),442 )443 .map_err(|err| format!("Relay chain argument error: {}", err))?;444445 info!("Parachain id: {:?}", para_id);446 info!("Parachain Account: {}", parachain_account);447 info!("Parachain genesis state: {}", genesis_state);448 info!("Parachain genesis hash: {}", genesis_hash);449 info!(450 "Is collating: {}",451 if config.role.is_authority() {452 "yes"453 } else {454 "no"455 }456 );457458 start_node_using_chain_runtime! {459 start_node(config, polkadot_config, collator_options, para_id)460 .await461 .map(|r| r.0)462 .map_err(Into::into)463 }464 })465 }466 }467}468469impl DefaultConfigurationValues for RelayChainCli {470 fn p2p_listen_port() -> u16 {471 30334472 }473474 fn rpc_ws_listen_port() -> u16 {475 9945476 }477478 fn rpc_http_listen_port() -> u16 {479 9934480 }481482 fn prometheus_listen_port() -> u16 {483 9616484 }485}486487impl CliConfiguration<Self> for RelayChainCli {488 fn shared_params(&self) -> &SharedParams {489 self.base.base.shared_params()490 }491492 fn import_params(&self) -> Option<&ImportParams> {493 self.base.base.import_params()494 }495496 fn network_params(&self) -> Option<&NetworkParams> {497 self.base.base.network_params()498 }499500 fn keystore_params(&self) -> Option<&KeystoreParams> {501 self.base.base.keystore_params()502 }503504 fn base_path(&self) -> Result<Option<BasePath>> {505 Ok(self506 .shared_params()507 .base_path()508 .or_else(|| self.base_path.clone().map(Into::into)))509 }510511 fn rpc_http(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> {512 self.base.base.rpc_http(default_listen_port)513 }514515 fn rpc_ipc(&self) -> Result<Option<String>> {516 self.base.base.rpc_ipc()517 }518519 fn rpc_ws(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> {520 self.base.base.rpc_ws(default_listen_port)521 }522523 fn prometheus_config(524 &self,525 default_listen_port: u16,526 chain_spec: &Box<dyn ChainSpec>,527 ) -> Result<Option<PrometheusConfig>> {528 self.base529 .base530 .prometheus_config(default_listen_port, chain_spec)531 }532533 fn init<F>(534 &self,535 _support_url: &String,536 _impl_version: &String,537 _logger_hook: F,538 _config: &sc_service::Configuration,539 ) -> Result<()> {540 unreachable!("PolkadotCli is never initialized; qed");541 }542543 fn chain_id(&self, is_dev: bool) -> Result<String> {544 let chain_id = self.base.base.chain_id(is_dev)?;545546 Ok(if chain_id.is_empty() {547 self.chain_id.clone().unwrap_or_default()548 } else {549 chain_id550 })551 }552553 fn role(&self, is_dev: bool) -> Result<sc_service::Role> {554 self.base.base.role(is_dev)555 }556557 fn transaction_pool(&self) -> Result<sc_service::config::TransactionPoolOptions> {558 self.base.base.transaction_pool()559 }560561 fn state_cache_child_ratio(&self) -> Result<Option<usize>> {562 self.base.base.state_cache_child_ratio()563 }564565 fn rpc_methods(&self) -> Result<sc_service::config::RpcMethods> {566 self.base.base.rpc_methods()567 }568569 fn rpc_ws_max_connections(&self) -> Result<Option<usize>> {570 self.base.base.rpc_ws_max_connections()571 }572573 fn rpc_cors(&self, is_dev: bool) -> Result<Option<Vec<String>>> {574 self.base.base.rpc_cors(is_dev)575 }576577 fn default_heap_pages(&self) -> Result<Option<u64>> {578 self.base.base.default_heap_pages()579 }580581 fn force_authoring(&self) -> Result<bool> {582 self.base.base.force_authoring()583 }584585 fn disable_grandpa(&self) -> Result<bool> {586 self.base.base.disable_grandpa()587 }588589 fn max_runtime_instances(&self) -> Result<Option<usize>> {590 self.base.base.max_runtime_instances()591 }592593 fn announce_block(&self) -> Result<bool> {594 self.base.base.announce_block()595 }596597 fn telemetry_endpoints(598 &self,599 chain_spec: &Box<dyn ChainSpec>,600 ) -> Result<Option<sc_telemetry::TelemetryEndpoints>> {601 self.base.base.telemetry_endpoints(chain_spec)602 }603}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// Original license18// This file is part of Substrate.1920// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.21// SPDX-License-Identifier: Apache-2.02223// Licensed under the Apache License, Version 2.0 (the "License");24// you may not use this file except in compliance with the License.25// You may obtain a copy of the License at26//27// http://www.apache.org/licenses/LICENSE-2.028//29// Unless required by applicable law or agreed to in writing, software30// distributed under the License is distributed on an "AS IS" BASIS,31// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.32// See the License for the specific language governing permissions and33// limitations under the License.3435use crate::{36 chain_spec::{self, RuntimeId, RuntimeIdentification, ServiceId, ServiceIdentification},37 cli::{Cli, RelayChainCli, Subcommand},38 service::{new_partial, start_node, start_dev_node, AutosealInterval},39};4041#[cfg(feature = "unique-runtime")]42use crate::service::UniqueRuntimeExecutor;4344#[cfg(feature = "quartz-runtime")]45use crate::service::QuartzRuntimeExecutor;4647use crate::service::OpalRuntimeExecutor;4849use codec::Encode;50use cumulus_primitives_core::ParaId;51use cumulus_client_service::genesis::generate_genesis_block;52use log::info;53use polkadot_parachain::primitives::AccountIdConversion;54use sc_cli::{55 ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,56 NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli,57};58use sc_service::{59 config::{BasePath, PrometheusConfig},60};61use sp_core::hexdisplay::HexDisplay;62use sp_runtime::traits::Block as BlockT;63use std::{io::Write, net::SocketAddr, time::Duration};6465use unique_runtime_common::types::Block;6667macro_rules! no_runtime_err {68 ($chain_name:expr) => {69 format!(70 "No runtime valid runtime was found for chain {}",71 $chain_name72 )73 };74}7576fn load_spec(id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {77 Ok(match id {78 "dev" => Box::new(chain_spec::development_config()),79 "" | "local" => Box::new(chain_spec::local_testnet_rococo_config()),80 path => {81 let path = std::path::PathBuf::from(path);82 let chain_spec = Box::new(chain_spec::OpalChainSpec::from_json_file(path.clone())?)83 as Box<dyn sc_service::ChainSpec>;8485 match chain_spec.runtime_id() {86 #[cfg(feature = "unique-runtime")]87 RuntimeId::Unique => Box::new(chain_spec::UniqueChainSpec::from_json_file(path)?),8889 #[cfg(feature = "quartz-runtime")]90 RuntimeId::Quartz => Box::new(chain_spec::QuartzChainSpec::from_json_file(path)?),9192 RuntimeId::Opal => chain_spec,93 RuntimeId::Unknown(chain) => return Err(no_runtime_err!(chain)),94 }95 }96 })97}9899impl SubstrateCli for Cli {100 // TODO use args101 fn impl_name() -> String {102 format!("{} Node", Self::node_name())103 }104105 fn impl_version() -> String {106 env!("SUBSTRATE_CLI_IMPL_VERSION").into()107 }108 // TODO use args109 fn description() -> String {110 format!(111 "{} Node\n\nThe command-line arguments provided first will be \112 passed to the parachain node, while the arguments provided after -- will be passed \113 to the relaychain node.\n\n\114 {} [parachain-args] -- [relaychain-args]",115 Self::node_name(),116 Self::executable_name()117 )118 }119120 fn author() -> String {121 env!("CARGO_PKG_AUTHORS").into()122 }123124 //TODO use args125 fn support_url() -> String {126 "support@unique.network".into()127 }128129 fn copyright_start_year() -> i32 {130 2019131 }132133 fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {134 load_spec(id)135 }136137 fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {138 match chain_spec.runtime_id() {139 #[cfg(feature = "unique-runtime")]140 RuntimeId::Unique => &unique_runtime::VERSION,141142 #[cfg(feature = "quartz-runtime")]143 RuntimeId::Quartz => &quartz_runtime::VERSION,144145 RuntimeId::Opal => &opal_runtime::VERSION,146 RuntimeId::Unknown(chain) => panic!("{}", no_runtime_err!(chain)),147 }148 }149}150151impl SubstrateCli for RelayChainCli {152 // TODO use args153 fn impl_name() -> String {154 format!("{} Node", Cli::node_name())155 }156157 fn impl_version() -> String {158 env!("SUBSTRATE_CLI_IMPL_VERSION").into()159 }160 // TODO use args161 fn description() -> String {162 format!(163 "{} Node\n\nThe command-line arguments provided first will be \164 passed to the parachain node, while the arguments provided after -- will be passed \165 to the relaychain node.\n\n\166 parachain-collator [parachain-args] -- [relaychain-args]",167 Cli::node_name()168 )169 }170171 fn author() -> String {172 env!("CARGO_PKG_AUTHORS").into()173 }174 // TODO use args175 fn support_url() -> String {176 "support@unique.network".into()177 }178179 fn copyright_start_year() -> i32 {180 2019181 }182183 fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {184 polkadot_cli::Cli::from_iter([RelayChainCli::executable_name()].iter()).load_spec(id)185 }186187 fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {188 polkadot_cli::Cli::native_runtime_version(chain_spec)189 }190}191192#[allow(clippy::borrowed_box)]193fn extract_genesis_wasm(chain_spec: &Box<dyn sc_service::ChainSpec>) -> Result<Vec<u8>> {194 let mut storage = chain_spec.build_storage()?;195196 storage197 .top198 .remove(sp_core::storage::well_known_keys::CODE)199 .ok_or_else(|| "Could not find wasm file in genesis state!".into())200}201202macro_rules! async_run_with_runtime {203 (204 $runtime_api:path, $executor:path,205 $runner:ident, $components:ident, $cli:ident, $cmd:ident, $config:ident,206 $( $code:tt )*207 ) => {208 $runner.async_run(|$config| {209 let $components = new_partial::<210 $runtime_api, $executor, _211 >(212 &$config,213 crate::service::parachain_build_import_queue,214 )?;215 let task_manager = $components.task_manager;216217 { $( $code )* }.map(|v| (v, task_manager))218 })219 };220}221222macro_rules! construct_async_run {223 (|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{224 let runner = $cli.create_runner($cmd)?;225226 match runner.config().chain_spec.runtime_id() {227 #[cfg(feature = "unique-runtime")]228 RuntimeId::Unique => async_run_with_runtime!(229 unique_runtime::RuntimeApi, UniqueRuntimeExecutor,230 runner, $components, $cli, $cmd, $config, $( $code )*231 ),232233 #[cfg(feature = "quartz-runtime")]234 RuntimeId::Quartz => async_run_with_runtime!(235 quartz_runtime::RuntimeApi, QuartzRuntimeExecutor,236 runner, $components, $cli, $cmd, $config, $( $code )*237 ),238239 RuntimeId::Opal => async_run_with_runtime!(240 opal_runtime::RuntimeApi, OpalRuntimeExecutor,241 runner, $components, $cli, $cmd, $config, $( $code )*242 ),243244 RuntimeId::Unknown(chain) => Err(no_runtime_err!(chain).into())245 }246 }}247}248249macro_rules! start_node_using_chain_runtime {250 ($start_node_fn:ident($config:expr $(, $($args:expr),+)?) $($code:tt)*) => {251 match $config.chain_spec.runtime_id() {252 #[cfg(feature = "unique-runtime")]253 RuntimeId::Unique => $start_node_fn::<254 unique_runtime::Runtime,255 unique_runtime::RuntimeApi,256 UniqueRuntimeExecutor,257 >($config $(, $($args),+)?) $($code)*,258259 #[cfg(feature = "quartz-runtime")]260 RuntimeId::Quartz => $start_node_fn::<261 quartz_runtime::Runtime,262 quartz_runtime::RuntimeApi,263 QuartzRuntimeExecutor,264 >($config $(, $($args),+)?) $($code)*,265266 RuntimeId::Opal => $start_node_fn::<267 opal_runtime::Runtime,268 opal_runtime::RuntimeApi,269 OpalRuntimeExecutor,270 >($config $(, $($args),+)?) $($code)*,271272 RuntimeId::Unknown(chain) => Err(no_runtime_err!(chain).into()),273 }274 };275}276277/// Parse command line arguments into service configuration.278pub fn run() -> Result<()> {279 let cli = Cli::from_args();280281 match &cli.subcommand {282 Some(Subcommand::BuildSpec(cmd)) => {283 let runner = cli.create_runner(cmd)?;284 runner.sync_run(|config| cmd.run(config.chain_spec, config.network))285 }286 Some(Subcommand::CheckBlock(cmd)) => {287 construct_async_run!(|components, cli, cmd, config| {288 Ok(cmd.run(components.client, components.import_queue))289 })290 }291 Some(Subcommand::ExportBlocks(cmd)) => {292 construct_async_run!(|components, cli, cmd, config| {293 Ok(cmd.run(components.client, config.database))294 })295 }296 Some(Subcommand::ExportState(cmd)) => {297 construct_async_run!(|components, cli, cmd, config| {298 Ok(cmd.run(components.client, config.chain_spec))299 })300 }301 Some(Subcommand::ImportBlocks(cmd)) => {302 construct_async_run!(|components, cli, cmd, config| {303 Ok(cmd.run(components.client, components.import_queue))304 })305 }306 Some(Subcommand::PurgeChain(cmd)) => {307 let runner = cli.create_runner(cmd)?;308309 runner.sync_run(|config| {310 let polkadot_cli = RelayChainCli::new(311 &config,312 [RelayChainCli::executable_name()]313 .iter()314 .chain(cli.relaychain_args.iter()),315 );316317 let polkadot_config = SubstrateCli::create_configuration(318 &polkadot_cli,319 &polkadot_cli,320 config.tokio_handle.clone(),321 )322 .map_err(|err| format!("Relay chain argument error: {}", err))?;323324 cmd.run(config, polkadot_config)325 })326 }327 Some(Subcommand::Revert(cmd)) => construct_async_run!(|components, cli, cmd, config| {328 Ok(cmd.run(components.client, components.backend))329 }),330 Some(Subcommand::ExportGenesisState(params)) => {331 let mut builder = sc_cli::LoggerBuilder::new("");332 builder.with_profiling(sc_tracing::TracingReceiver::Log, "");333 let _ = builder.init();334335 let spec = load_spec(¶ms.chain.clone().unwrap_or_default())?;336 let state_version = Cli::native_runtime_version(&spec).state_version();337 let block: Block = generate_genesis_block(&spec, state_version)?;338 let raw_header = block.header().encode();339 let output_buf = if params.raw {340 raw_header341 } else {342 format!("0x{:?}", HexDisplay::from(&block.header().encode())).into_bytes()343 };344345 if let Some(output) = ¶ms.output {346 std::fs::write(output, output_buf)?;347 } else {348 std::io::stdout().write_all(&output_buf)?;349 }350351 Ok(())352 }353 Some(Subcommand::ExportGenesisWasm(params)) => {354 let mut builder = sc_cli::LoggerBuilder::new("");355 builder.with_profiling(sc_tracing::TracingReceiver::Log, "");356 let _ = builder.init();357358 let raw_wasm_blob =359 extract_genesis_wasm(&cli.load_spec(¶ms.chain.clone().unwrap_or_default())?)?;360 let output_buf = if params.raw {361 raw_wasm_blob362 } else {363 format!("0x{:?}", HexDisplay::from(&raw_wasm_blob)).into_bytes()364 };365366 if let Some(output) = ¶ms.output {367 std::fs::write(output, output_buf)?;368 } else {369 std::io::stdout().write_all(&output_buf)?;370 }371372 Ok(())373 }374 Some(Subcommand::Benchmark(cmd)) => {375 if cfg!(feature = "runtime-benchmarks") {376 let runner = cli.create_runner(cmd)?;377 runner.sync_run(|config| match config.chain_spec.runtime_id() {378 #[cfg(feature = "unique-runtime")]379 RuntimeId::Unique => cmd.run::<Block, UniqueRuntimeExecutor>(config),380381 #[cfg(feature = "quartz-runtime")]382 RuntimeId::Quartz => cmd.run::<Block, QuartzRuntimeExecutor>(config),383384 RuntimeId::Opal => cmd.run::<Block, OpalRuntimeExecutor>(config),385 RuntimeId::Unknown(chain) => Err(no_runtime_err!(chain).into()),386 })387 } else {388 Err("Benchmarking wasn't enabled when building the node. \389 You can enable it with `--features runtime-benchmarks`."390 .into())391 }392 }393 None => {394 let runner = cli.create_runner(&cli.run.normalize())?;395 let collator_options = cli.run.collator_options();396397 runner.run_node_until_exit(|config| async move {398 let extensions = chain_spec::Extensions::try_get(&*config.chain_spec);399400 let service_id = config.chain_spec.service_id();401 let relay_chain_id = extensions.map(|e| e.relay_chain.clone());402 let is_dev_service = matches![service_id, ServiceId::Dev]403 || relay_chain_id == Some("dev-service".into());404405 if is_dev_service {406 info!("Running Dev service");407408 let autoseal_interval = AutosealInterval::new(409 Duration::from_millis(cli.idle_autoseal_interval)410 )?;411412 return start_node_using_chain_runtime! {413 start_dev_node(config, autoseal_interval).map_err(Into::into)414 };415 };416417 let para_id = extensions418 .map(|e| e.para_id)419 .ok_or("Could not find parachain ID in chain-spec.")?;420421 let polkadot_cli = RelayChainCli::new(422 &config,423 [RelayChainCli::executable_name()]424 .iter()425 .chain(cli.relaychain_args.iter()),426 );427428 let para_id = ParaId::from(para_id);429430 let parachain_account =431 AccountIdConversion::<polkadot_primitives::v0::AccountId>::into_account(432 ¶_id,433 );434435 let state_version =436 RelayChainCli::native_runtime_version(&config.chain_spec).state_version();437 let block: Block = generate_genesis_block(&config.chain_spec, state_version)438 .map_err(|e| format!("{:?}", e))?;439 let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));440 let genesis_hash = format!("0x{:?}", HexDisplay::from(&block.header().hash().0));441442 let polkadot_config = SubstrateCli::create_configuration(443 &polkadot_cli,444 &polkadot_cli,445 config.tokio_handle.clone(),446 )447 .map_err(|err| format!("Relay chain argument error: {}", err))?;448449 info!("Parachain id: {:?}", para_id);450 info!("Parachain Account: {}", parachain_account);451 info!("Parachain genesis state: {}", genesis_state);452 info!("Parachain genesis hash: {}", genesis_hash);453 info!(454 "Is collating: {}",455 if config.role.is_authority() {456 "yes"457 } else {458 "no"459 }460 );461462 start_node_using_chain_runtime! {463 start_node(config, polkadot_config, collator_options, para_id)464 .await465 .map(|r| r.0)466 .map_err(Into::into)467 }468 })469 }470 }471}472473impl DefaultConfigurationValues for RelayChainCli {474 fn p2p_listen_port() -> u16 {475 30334476 }477478 fn rpc_ws_listen_port() -> u16 {479 9945480 }481482 fn rpc_http_listen_port() -> u16 {483 9934484 }485486 fn prometheus_listen_port() -> u16 {487 9616488 }489}490491impl CliConfiguration<Self> for RelayChainCli {492 fn shared_params(&self) -> &SharedParams {493 self.base.base.shared_params()494 }495496 fn import_params(&self) -> Option<&ImportParams> {497 self.base.base.import_params()498 }499500 fn network_params(&self) -> Option<&NetworkParams> {501 self.base.base.network_params()502 }503504 fn keystore_params(&self) -> Option<&KeystoreParams> {505 self.base.base.keystore_params()506 }507508 fn base_path(&self) -> Result<Option<BasePath>> {509 Ok(self510 .shared_params()511 .base_path()512 .or_else(|| self.base_path.clone().map(Into::into)))513 }514515 fn rpc_http(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> {516 self.base.base.rpc_http(default_listen_port)517 }518519 fn rpc_ipc(&self) -> Result<Option<String>> {520 self.base.base.rpc_ipc()521 }522523 fn rpc_ws(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> {524 self.base.base.rpc_ws(default_listen_port)525 }526527 fn prometheus_config(528 &self,529 default_listen_port: u16,530 chain_spec: &Box<dyn ChainSpec>,531 ) -> Result<Option<PrometheusConfig>> {532 self.base533 .base534 .prometheus_config(default_listen_port, chain_spec)535 }536537 fn init<F>(538 &self,539 _support_url: &String,540 _impl_version: &String,541 _logger_hook: F,542 _config: &sc_service::Configuration,543 ) -> Result<()> {544 unreachable!("PolkadotCli is never initialized; qed");545 }546547 fn chain_id(&self, is_dev: bool) -> Result<String> {548 let chain_id = self.base.base.chain_id(is_dev)?;549550 Ok(if chain_id.is_empty() {551 self.chain_id.clone().unwrap_or_default()552 } else {553 chain_id554 })555 }556557 fn role(&self, is_dev: bool) -> Result<sc_service::Role> {558 self.base.base.role(is_dev)559 }560561 fn transaction_pool(&self) -> Result<sc_service::config::TransactionPoolOptions> {562 self.base.base.transaction_pool()563 }564565 fn state_cache_child_ratio(&self) -> Result<Option<usize>> {566 self.base.base.state_cache_child_ratio()567 }568569 fn rpc_methods(&self) -> Result<sc_service::config::RpcMethods> {570 self.base.base.rpc_methods()571 }572573 fn rpc_ws_max_connections(&self) -> Result<Option<usize>> {574 self.base.base.rpc_ws_max_connections()575 }576577 fn rpc_cors(&self, is_dev: bool) -> Result<Option<Vec<String>>> {578 self.base.base.rpc_cors(is_dev)579 }580581 fn default_heap_pages(&self) -> Result<Option<u64>> {582 self.base.base.default_heap_pages()583 }584585 fn force_authoring(&self) -> Result<bool> {586 self.base.base.force_authoring()587 }588589 fn disable_grandpa(&self) -> Result<bool> {590 self.base.base.disable_grandpa()591 }592593 fn max_runtime_instances(&self) -> Result<Option<usize>> {594 self.base.base.max_runtime_instances()595 }596597 fn announce_block(&self) -> Result<bool> {598 self.base.base.announce_block()599 }600601 fn telemetry_endpoints(602 &self,603 chain_spec: &Box<dyn ChainSpec>,604 ) -> Result<Option<sc_telemetry::TelemetryEndpoints>> {605 self.base.base.telemetry_endpoints(chain_spec)606 }607}node/cli/src/service.rsdiffbeforeafterboth--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -21,8 +21,11 @@
use std::sync::Mutex;
use std::collections::BTreeMap;
use std::time::Duration;
+use std::pin::Pin;
use fc_rpc_core::types::FeeHistoryCache;
-use futures::StreamExt;
+use futures::Future;
+use futures::{Stream, StreamExt, stream::select, task::{Context, Poll}};
+use futures_timer::Delay;
use unique_rpc::overrides_handle;
@@ -111,6 +114,40 @@
}
}
+pub struct AutosealInterval {
+ duration: Duration,
+ delay_handle: Pin<Box<Delay>>
+}
+
+impl AutosealInterval {
+ pub fn new(duration: Duration) -> Result<Self, String> {
+ if duration.is_zero() {
+ return Err("Invalid autoseal interval: 0 seconds".into());
+ }
+
+ Ok(Self {
+ duration,
+ delay_handle: Box::pin(Delay::new(duration))
+ })
+ }
+}
+
+impl Stream for AutosealInterval {
+ type Item = ();
+
+ fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+ match self.delay_handle.as_mut().poll(cx) {
+ Poll::Ready(_) => {
+ let duration = self.duration;
+ self.delay_handle.reset(duration);
+
+ Poll::Ready(Some(()))
+ }
+ Poll::Pending => Poll::Pending
+ }
+ }
+}
+
pub fn open_frontier_backend(config: &Configuration) -> Result<Arc<fc_db::Backend<Block>>, String> {
let config_dir = config
.base_path
@@ -712,6 +749,7 @@
/// the parachain inherent
pub fn start_dev_node<Runtime, RuntimeApi, ExecutorDispatch>(
config: Configuration,
+ autoseal_interval: AutosealInterval,
) -> sc_service::error::Result<TaskManager>
where
Runtime: RuntimeInstance + Send + Sync + 'static,
@@ -735,7 +773,6 @@
+ sp_consensus_aura::AuraApi<Block, AuraId>,
ExecutorDispatch: NativeExecutionDispatch + 'static,
{
- use futures::Stream;
use sc_consensus_manual_seal::{run_manual_seal, EngineCommand, ManualSealParams};
use fc_consensus::FrontierBlockImport;
use sc_client_api::HeaderBackend;
@@ -799,21 +836,36 @@
telemetry.as_ref().map(|x| x.handle()),
);
- let commands_stream: Box<dyn Stream<Item = EngineCommand<Hash>> + Send + Sync + Unpin> =
+ let transactions_commands_stream: Box<dyn Stream<Item = EngineCommand<Hash>> + Send + Sync + Unpin> =
Box::new(
- // This bit cribbed from the implementation of instant seal.
transaction_pool
.pool()
.validated_pool()
.import_notification_stream()
.map(|_| EngineCommand::SealNewBlock {
- create_empty: true, // was false in Moonbeam
+ create_empty: true,
finalize: false,
parent_hash: None,
sender: None,
}),
);
+ let autoseal_interval = Box::pin(autoseal_interval);
+ let idle_commands_stream: Box<dyn Stream<Item = EngineCommand<Hash>> + Send + Sync + Unpin> =
+ Box::new(
+ autoseal_interval.map(|_| EngineCommand::SealNewBlock {
+ create_empty: true,
+ finalize: false,
+ parent_hash: None,
+ sender: None,
+ })
+ );
+
+ let commands_stream = select(
+ transactions_commands_stream,
+ idle_commands_stream
+ );
+
let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
let client_set_aside_for_cidp = client.clone();