Add manual seal node

cumulus/polkadot-parachain/polkadot-parachain-lib/Cargo.toml

@@ -61,6 +61,7 @@ pallet-transaction-payment-rpc-runtime-api = { workspace = true, default-feature
 sp-inherents = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-consensus-aura = { workspace = true, default-features = true }
+sc-consensus-manual-seal = { workspace = true, default-features = true }
 sc-sysinfo = { workspace = true, default-features = true }
 prometheus-endpoint = { workspace = true, default-features = true }
 substrate-frame-rpc-system = { workspace = true, default-features = true }
@@ -83,6 +84,7 @@ cumulus-client-service = { workspace = true, default-features = true }
 cumulus-primitives-aura = { workspace = true, default-features = true }
 cumulus-primitives-core = { workspace = true, default-features = true }
 cumulus-relay-chain-interface = { workspace = true, default-features = true }
+futures-timer = "3.0.3"
 
 [dev-dependencies]
 assert_cmd = { workspace = true }

cumulus/polkadot-parachain/polkadot-parachain-lib/src/cli.rs

@@ -119,6 +119,12 @@ pub struct Cli<Config: CliConfig> {
  #[command(flatten)]
  pub run: cumulus_client_cli::RunCmd,
 
+ /// Use manual seal consensus.
+ ///
+ /// This works only with dev chains (e.g. asset-hub-rococo-dev).
+ #[arg(long)]
+ pub manual_seal: bool,
+
  /// EXPERIMENTAL: Use slot-based collator which can handle elastic scaling.
  ///
  /// Use with care, this flag is unstable and subject to change.

cumulus/polkadot-parachain/polkadot-parachain-lib/src/command.rs

@@ -22,12 +22,11 @@ use crate::{
  AuraConsensusId, Consensus, Runtime, RuntimeResolver as RuntimeResolverT,
  RuntimeResolver,
  },
- spec::DynNodeSpec,
  types::Block,
  NodeBlock, NodeExtraArgs,
  },
  fake_runtime_api,
- nodes::shell::ShellNode,
+ nodes::{shell::ShellNode, DynNodeSpecExt},
  runtime::BlockNumber,
 };
 #[cfg(feature = "runtime-benchmarks")]
@@ -39,7 +38,6 @@ use sc_cli::{Result, SubstrateCli};
 use sp_runtime::traits::AccountIdConversion;
 #[cfg(feature = "runtime-benchmarks")]
 use sp_runtime::traits::HashingFor;
-use std::panic::{RefUnwindSafe, UnwindSafe};
 
 /// Structure that can be used in order to provide customizers for different functionalities of the
 /// node binary that is being built using this library.
@@ -53,10 +51,9 @@ pub struct RunConfig {
 pub fn new_aura_node_spec<Block>(
  aura_id: AuraConsensusId,
  extra_args: &NodeExtraArgs,
-) -> Box<dyn DynNodeSpec>
+) -> Box<dyn DynNodeSpecExt>
 where
- Block: NodeBlock + UnwindSafe + RefUnwindSafe,
- Block::BoundedHeader: UnwindSafe + RefUnwindSafe,
+ Block: NodeBlock,
 {
  match aura_id {
  AuraConsensusId::Sr25519 => crate::nodes::aura::new_aura_node_spec::<
@@ -76,7 +73,7 @@ fn new_node_spec(
  config: &sc_service::Configuration,
  runtime_resolver: &Box<dyn RuntimeResolverT>,
  extra_args: &NodeExtraArgs,
-) -> std::result::Result<Box<dyn DynNodeSpec>, sc_cli::Error> {
+) -> std::result::Result<Box<dyn DynNodeSpecExt>, sc_cli::Error> {
  let runtime = runtime_resolver.runtime(config.chain_spec.as_ref())?;
 
  Ok(match runtime {
@@ -215,7 +212,24 @@ pub fn run<CliConfig: crate::cli::CliConfig>(cmd_config: RunConfig) -> Result<()
  RelayChainCli::<CliConfig>::new(runner.config(), cli.relay_chain_args.iter());
  let collator_options = cli.run.collator_options();
 
+ let is_dev_chain = runner.config().chain_spec.id().ends_with("-dev");
+ if cli.manual_seal && !is_dev_chain {
+ return Err("Manual sealing can be turned on only for dev chains".into());
+ }
+
  runner.run_node_until_exit(|config| async move {
+ let node_spec =
+ new_node_spec(&config, &cmd_config.runtime_resolver, &cli.node_extra_args())?;
+ let para_id = ParaId::from(
+ Extensions::try_get(&*config.chain_spec)
+ .map(|e| e.para_id)
+ .ok_or("Could not find parachain extension in chain-spec.")?,
+ );
+
+ if cli.manual_seal {
+ return node_spec.start_manual_seal_node(config, para_id).map_err(Into::into)
+ }
+
  // If Statemint (Statemine, Westmint, Rockmine) DB exists and we're using the
  // asset-hub chain spec, then rename the base path to the new chain ID. In the case
  // that both file paths exist, the node will exit, as the user must decide (by
@@ -262,32 +276,26 @@ pub fn run<CliConfig: crate::cli::CliConfig>(cmd_config: RunConfig) -> Result<()
  }))
  .flatten();
 
- let para_id = Extensions::try_get(&*config.chain_spec)
- .map(|e| e.para_id)
- .ok_or("Could not find parachain extension in chain-spec.")?;
-
- let id = ParaId::from(para_id);
-
  let parachain_account =
  AccountIdConversion::<polkadot_primitives::AccountId>::into_account_truncating(
- &id,
+ &para_id,
  );
 
  let tokio_handle = config.tokio_handle.clone();
  let polkadot_config =
  SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, tokio_handle)
  .map_err(|err| format!("Relay chain argument error: {}", err))?;
 
- info!("🪪 Parachain id: {:?}", id);
+ info!("🪪 Parachain id: {:?}", para_id);
  info!("🧾 Parachain Account: {}", parachain_account);
  info!("✍️ Is collating: {}", if config.role.is_authority() { "yes" } else { "no" });
 
  start_node(
+ node_spec,
  config,
- &cmd_config.runtime_resolver,
  polkadot_config,
  collator_options,
- id,
+ para_id,
  cli.node_extra_args(),
  hwbench,
  )
@@ -297,17 +305,20 @@ pub fn run<CliConfig: crate::cli::CliConfig>(cmd_config: RunConfig) -> Result<()
  }
 }
 
+/// This method is needed only for `#[sc_tracing::logging::prefix_logs_with("Parachain")]`.
+///
+/// Adding this annotation to `DynNodeSpec::start_node()` doesn't work, probably because of the
+/// `Pin<Box<dyn Future<...>>>` return type.
 #[sc_tracing::logging::prefix_logs_with("Parachain")]
 async fn start_node(
+ node_spec: Box<dyn DynNodeSpecExt>,
  config: sc_service::Configuration,
- runtime_resolver: &Box<dyn RuntimeResolverT>,
  polkadot_config: sc_service::Configuration,
  collator_options: cumulus_client_cli::CollatorOptions,
  id: ParaId,
  extra_args: NodeExtraArgs,
  hwbench: Option<sc_sysinfo::HwBench>,
 ) -> Result<sc_service::TaskManager> {
- let node_spec = new_node_spec(&config, runtime_resolver, &extra_args)?;
  node_spec
  .start_node(config, polkadot_config, collator_options, id, hwbench, extra_args)
  .await

cumulus/polkadot-parachain/polkadot-parachain-lib/src/nodes/aura.rs

@@ -14,14 +14,18 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus. If not, see <http://www.gnu.org/licenses/>.
 
-use crate::common::{
- aura::{AuraIdT, AuraRuntimeApi},
- rpc::BuildParachainRpcExtensions,
- spec::{BaseNodeSpec, BuildImportQueue, DynNodeSpec, NodeSpec, StartConsensus},
- types::{
- AccountId, Balance, Hash, Nonce, ParachainBackend, ParachainBlockImport, ParachainClient,
+use crate::{
+ common::{
+ aura::{AuraIdT, AuraRuntimeApi},
+ rpc::BuildParachainRpcExtensions,
+ spec::{BaseNodeSpec, BuildImportQueue, NodeSpec, StartConsensus},
+ types::{
+ AccountId, Balance, Hash, Nonce, ParachainBackend, ParachainBlockImport,
+ ParachainClient,
+ },
+ ConstructNodeRuntimeApi, NodeBlock, NodeExtraArgs,
  },
- ConstructNodeRuntimeApi, NodeBlock, NodeExtraArgs,
+ nodes::DynNodeSpecExt,
 };
 use cumulus_client_collator::service::{
  CollatorService, ServiceInterface as CollatorServiceInterface,
@@ -199,7 +203,7 @@ where
 
 pub fn new_aura_node_spec<Block, RuntimeApi, AuraId>(
  extra_args: &NodeExtraArgs,
-) -> Box<dyn DynNodeSpec>
+) -> Box<dyn DynNodeSpecExt>
 where
  Block: NodeBlock,
  RuntimeApi: ConstructNodeRuntimeApi<Block, ParachainClient<Block, RuntimeApi>>,