git.delta.rocks / unique-network / refs/commits / b6b1e0f0607a

difftreelog

feat add cli param disable-autoseal-on-tx

Daniel Shiposha2023-10-02parent: #74a28c8.patch.diff
in: master

3 files changed

modifiednode/cli/src/cli.rsdiffbeforeafterboth
before · node/cli/src/cli.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/>.1617use crate::chain_spec;18use std::path::PathBuf;19use clap::Parser;2021/// Sub-commands supported by the collator.22#[derive(Debug, Parser)]23pub enum Subcommand {24	/// Export the genesis state of the parachain.25	ExportGenesisState(cumulus_client_cli::ExportGenesisStateCommand),2627	/// Export the genesis wasm of the parachain.28	ExportGenesisWasm(cumulus_client_cli::ExportGenesisWasmCommand),2930	/// Keys manipulation subcommand31	#[clap(subcommand)]32	Key(sc_cli::KeySubcommand),3334	/// Build a chain specification.35	BuildSpec(sc_cli::BuildSpecCmd),3637	/// Validate blocks.38	CheckBlock(sc_cli::CheckBlockCmd),3940	/// Export blocks.41	ExportBlocks(sc_cli::ExportBlocksCmd),4243	/// Export the state of a given block into a chain spec.44	ExportState(sc_cli::ExportStateCmd),4546	/// Import blocks.47	ImportBlocks(sc_cli::ImportBlocksCmd),4849	/// Remove the whole chain.50	PurgeChain(cumulus_client_cli::PurgeChainCmd),5152	/// Revert the chain to a previous state.53	Revert(sc_cli::RevertCmd),5455	/// The custom benchmark subcommmand benchmarking runtime pallets.56	#[clap(subcommand)]57	#[cfg(feature = "runtime-benchmarks")]58	Benchmark(frame_benchmarking_cli::BenchmarkCmd),5960	/// Try runtime61	#[cfg(feature = "try-runtime")]62	TryRuntime(try_runtime_cli::TryRuntimeCmd),6364	/// Try runtime. Note: `try-runtime` feature must be enabled.65	#[cfg(not(feature = "try-runtime"))]66	TryRuntime,67}6869#[derive(Debug, Parser)]70#[clap(args_conflicts_with_subcommands = true, subcommand_negates_reqs = true)]71pub struct Cli {72	#[structopt(subcommand)]73	pub subcommand: Option<Subcommand>,7475	#[structopt(flatten)]76	pub run: cumulus_client_cli::RunCmd,7778	/// When running the node in the `--dev` mode and79	/// there is no transaction in the transaction pool,80	/// an empty block will be sealed automatically81	/// after the `--idle-autoseal-interval` milliseconds.82	///83	/// The default interval is 500 milliseconds84	#[structopt(default_value = "500", long)]85	pub idle_autoseal_interval: u64,8687	/// Disable automatic hardware benchmarks.88	///89	/// By default these benchmarks are automatically ran at startup and measure90	/// the CPU speed, the memory bandwidth and the disk speed.91	///92	/// The results are then printed out in the logs, and also sent as part of93	/// telemetry, if telemetry is enabled.94	#[clap(long)]95	pub no_hardware_benchmarks: bool,9697	/// Relaychain arguments98	#[structopt(raw = true)]99	pub relaychain_args: Vec<String>,100}101102impl Cli {103	pub fn node_name() -> String {104		"Unique".into()105	}106}107108#[derive(Debug)]109pub struct RelayChainCli {110	/// The actual relay chain cli object.111	pub base: polkadot_cli::RunCmd,112113	/// Optional chain id that should be passed to the relay chain.114	pub chain_id: Option<String>,115116	/// The base path that should be used by the relay chain.117	pub base_path: PathBuf,118}119120impl RelayChainCli {121	/// Parse the relay chain CLI parameters using the para chain `Configuration`.122	pub fn new<'a>(123		para_config: &sc_service::Configuration,124		relay_chain_args: impl Iterator<Item = &'a String>,125	) -> Self {126		let extension = chain_spec::Extensions::try_get(&*para_config.chain_spec);127		let chain_id = extension.map(|e| e.relay_chain.clone());128		let base_path = para_config.base_path.path().join("polkadot");129		Self {130			base_path,131			chain_id,132			base: polkadot_cli::RunCmd::parse_from(relay_chain_args),133		}134	}135}
modifiednode/cli/src/command.rsdiffbeforeafterboth
--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -488,7 +488,7 @@
 					config.state_pruning = Some(sc_service::PruningMode::ArchiveAll);
 
 					return start_node_using_chain_runtime! {
-						start_dev_node(config, autoseal_interval).map_err(Into::into)
+						start_dev_node(config, autoseal_interval, cli.disable_autoseal_on_tx).map_err(Into::into)
 					};
 				};
 
modifiednode/cli/src/service.rsdiffbeforeafterboth
--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -886,6 +886,7 @@
 pub fn start_dev_node<Runtime, RuntimeApi, ExecutorDispatch>(
 	config: Configuration,
 	autoseal_interval: Duration,
+	disable_autoseal_on_tx: bool,
 ) -> sc_service::error::Result<TaskManager>
 where
 	Runtime: RuntimeInstance + Send + Sync + 'static,
@@ -980,6 +981,7 @@
 				.pool()
 				.validated_pool()
 				.import_notification_stream()
+				.filter(move |_| futures::future::ready(!disable_autoseal_on_tx))
 				.map(|_| EngineCommand::SealNewBlock {
 					create_empty: true,
 					finalize: false, // todo:collator finalize true