Merge subspace-executor executable into subspace-node #366
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,10 +18,10 @@ | |
|
|
||
| use frame_benchmarking_cli::BenchmarkCmd; | ||
| use futures::future::TryFutureExt; | ||
| use sc_cli::{ChainSpec, CliConfiguration, SubstrateCli}; | ||
| use sc_service::{PartialComponents, Role}; | ||
| use sp_core::crypto::Ss58AddressFormat; | ||
| use subspace_node::{Cli, ExecutorDispatch, SecondaryChainCli, Subcommand}; | ||
| use subspace_runtime::{Block, RuntimeApi}; | ||
|
|
||
| /// Subspace node error. | ||
|
|
@@ -73,6 +73,47 @@ fn set_default_ss58_version<C: AsRef<dyn ChainSpec>>(chain_spec: C) { | |
| fn main() -> std::result::Result<(), Error> { | ||
| let cli = Cli::from_args(); | ||
|
|
||
| if !cli.secondarychain_args.is_empty() { | ||
| let secondary_chain_cli = | ||
|
There was a problem hiding this comment. I don't understand why is this all before Also I was expecting that primary chain would start just like before and in its There was a problem hiding this comment.
That's reasonable, updated.
All executor-related sub-commands are TODO for now.
When running an executor, the runner has to be created using Primary networking is started here: There was a problem hiding this comment. I see. In future we'll probably want to have it the other way around and start networking outside of that. |
||
| SecondaryChainCli::new(cli.run.base.base_path()?, cli.secondarychain_args.iter()); | ||
|
|
||
| let runner = SubstrateCli::create_runner(&secondary_chain_cli, &secondary_chain_cli)?; | ||
| set_default_ss58_version(&runner.config().chain_spec); | ||
| runner.run_node_until_exit(|config| async move { | ||
| let primary_chain_full_node = { | ||
| let span = sc_tracing::tracing::info_span!( | ||
| sc_tracing::logging::PREFIX_LOG_SPAN, | ||
| name = "Primarychain" | ||
| ); | ||
| let _enter = span.enter(); | ||
|
|
||
| let mut primary_config = cli | ||
| .create_configuration(&cli.run.base, config.tokio_handle.clone()) | ||
| .map_err(|_| { | ||
| sc_service::Error::Other("Failed to create subspace configuration".into()) | ||
| })?; | ||
|
|
||
| // The embedded primary full node must be an authority node for the new slots | ||
| // notification. | ||
| primary_config.role = Role::Authority; | ||
|
|
||
| subspace_service::new_full::<subspace_runtime::RuntimeApi, ExecutorDispatch>( | ||
| primary_config, | ||
| false, | ||
| ) | ||
| .map_err(|_| { | ||
| sc_service::Error::Other("Failed to build a full subspace node".into()) | ||
| })? | ||
| }; | ||
|
|
||
| cirrus_node::service::start_parachain_node(config, primary_chain_full_node) | ||
| .await | ||
| .map(|r| r.0) | ||
| })?; | ||
|
|
||
| return Ok(()); | ||
| } | ||
|
|
||
| match &cli.subcommand { | ||
| Some(Subcommand::Key(cmd)) => cmd.run(&cli)?, | ||
| Some(Subcommand::BuildSpec(cmd)) => { | ||
|
|
@@ -222,6 +263,9 @@ fn main() -> std::result::Result<(), Error> { | |
| } | ||
| })?; | ||
| } | ||
| Some(Subcommand::Executor(_cmd)) => { | ||
| unimplemented!("Executor subcommand"); | ||
| } | ||
| None => { | ||
| let runner = cli.create_runner(&cli.run.base)?; | ||
| set_default_ss58_version(&runner.config().chain_spec); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,189 @@ | ||
| use clap::Parser; | ||
| use sc_cli::{ | ||
| ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, | ||
| NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli, | ||
| }; | ||
| use sc_service::{config::PrometheusConfig, BasePath}; | ||
| use std::{net::SocketAddr, path::PathBuf}; | ||
|
|
||
| #[derive(Debug)] | ||
| pub struct SecondaryChainCli { | ||
| /// The actual secondary chain cli object. | ||
| pub base: cumulus_client_cli::RunCmd, | ||
|
|
||
| /// The base path that should be used by the secondary chain. | ||
| pub base_path: Option<PathBuf>, | ||
| } | ||
|
|
||
| impl SecondaryChainCli { | ||
| /// Constructs a new instance of [`SecondaryChainCli`]. | ||
| /// | ||
| /// If no explicit base path for the secondary chain, the default value will be `primary_base_path/executor`. | ||
| pub fn new<'a>( | ||
| primary_base_path: Option<BasePath>, | ||
| relay_chain_args: impl Iterator<Item = &'a String>, | ||
| ) -> Self { | ||
| let base_path = primary_base_path.map(|x| x.path().join("executor")); | ||
| Self { | ||
| base_path, | ||
| base: cumulus_client_cli::RunCmd::parse_from(relay_chain_args), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl SubstrateCli for SecondaryChainCli { | ||
| fn impl_name() -> String { | ||
| "Subspace Executor".into() | ||
| } | ||
|
|
||
| fn impl_version() -> String { | ||
| env!("SUBSTRATE_CLI_IMPL_VERSION").into() | ||
| } | ||
|
|
||
| fn description() -> String { | ||
| "Subspace Executor".into() | ||
| } | ||
|
|
||
| fn author() -> String { | ||
| env!("CARGO_PKG_AUTHORS").into() | ||
| } | ||
|
|
||
| fn support_url() -> String { | ||
| "https://github.com/subspace/subspace/issues/new".into() | ||
| } | ||
|
|
||
| fn copyright_start_year() -> i32 { | ||
| 2022 | ||
| } | ||
|
|
||
| fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> { | ||
| <cirrus_node::cli::Cli as SubstrateCli>::from_iter( | ||
| [SecondaryChainCli::executable_name()].iter(), | ||
| ) | ||
| .load_spec(id) | ||
| } | ||
|
|
||
| fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion { | ||
| cirrus_node::cli::Cli::native_runtime_version(chain_spec) | ||
| } | ||
| } | ||
|
|
||
| impl DefaultConfigurationValues for SecondaryChainCli { | ||
| fn p2p_listen_port() -> u16 { | ||
| 30334 | ||
| } | ||
|
|
||
| fn rpc_ws_listen_port() -> u16 { | ||
| 9945 | ||
| } | ||
|
|
||
| fn rpc_http_listen_port() -> u16 { | ||
| 9934 | ||
| } | ||
|
|
||
| fn prometheus_listen_port() -> u16 { | ||
| 9616 | ||
| } | ||
| } | ||
|
|
||
| impl CliConfiguration<Self> for SecondaryChainCli { | ||
| fn shared_params(&self) -> &SharedParams { | ||
| self.base.base.shared_params() | ||
| } | ||
|
|
||
| fn import_params(&self) -> Option<&ImportParams> { | ||
| self.base.base.import_params() | ||
| } | ||
|
|
||
| fn network_params(&self) -> Option<&NetworkParams> { | ||
| self.base.base.network_params() | ||
| } | ||
|
|
||
| fn keystore_params(&self) -> Option<&KeystoreParams> { | ||
| self.base.base.keystore_params() | ||
| } | ||
|
|
||
| fn base_path(&self) -> Result<Option<BasePath>> { | ||
| Ok(self | ||
| .shared_params() | ||
| .base_path() | ||
| .or_else(|| self.base_path.clone().map(Into::into))) | ||
| } | ||
|
|
||
| fn rpc_http(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> { | ||
| self.base.base.rpc_http(default_listen_port) | ||
| } | ||
|
|
||
| fn rpc_ipc(&self) -> Result<Option<String>> { | ||
| self.base.base.rpc_ipc() | ||
| } | ||
|
|
||
| fn rpc_ws(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> { | ||
| self.base.base.rpc_ws(default_listen_port) | ||
| } | ||
|
|
||
| fn prometheus_config( | ||
| &self, | ||
| default_listen_port: u16, | ||
| chain_spec: &Box<dyn ChainSpec>, | ||
| ) -> Result<Option<PrometheusConfig>> { | ||
| self.base | ||
| .base | ||
| .prometheus_config(default_listen_port, chain_spec) | ||
| } | ||
|
|
||
| fn chain_id(&self, is_dev: bool) -> Result<String> { | ||
| self.base.base.chain_id(is_dev) | ||
| } | ||
|
|
||
| fn role(&self, is_dev: bool) -> Result<sc_service::Role> { | ||
| self.base.base.role(is_dev) | ||
| } | ||
|
|
||
| fn transaction_pool(&self) -> Result<sc_service::config::TransactionPoolOptions> { | ||
| self.base.base.transaction_pool() | ||
| } | ||
|
|
||
| fn state_cache_child_ratio(&self) -> Result<Option<usize>> { | ||
| self.base.base.state_cache_child_ratio() | ||
| } | ||
|
|
||
| fn rpc_methods(&self) -> Result<sc_service::config::RpcMethods> { | ||
| self.base.base.rpc_methods() | ||
| } | ||
|
|
||
| fn rpc_ws_max_connections(&self) -> Result<Option<usize>> { | ||
| self.base.base.rpc_ws_max_connections() | ||
| } | ||
|
|
||
| fn rpc_cors(&self, is_dev: bool) -> Result<Option<Vec<String>>> { | ||
| self.base.base.rpc_cors(is_dev) | ||
| } | ||
|
|
||
| fn default_heap_pages(&self) -> Result<Option<u64>> { | ||
| self.base.base.default_heap_pages() | ||
| } | ||
|
|
||
| fn force_authoring(&self) -> Result<bool> { | ||
| self.base.base.force_authoring() | ||
| } | ||
|
|
||
| fn disable_grandpa(&self) -> Result<bool> { | ||
| self.base.base.disable_grandpa() | ||
| } | ||
|
|
||
| fn max_runtime_instances(&self) -> Result<Option<usize>> { | ||
| self.base.base.max_runtime_instances() | ||
| } | ||
|
|
||
| fn announce_block(&self) -> Result<bool> { | ||
| self.base.base.announce_block() | ||
| } | ||
|
|
||
| fn telemetry_endpoints( | ||
| &self, | ||
| chain_spec: &Box<dyn ChainSpec>, | ||
| ) -> Result<Option<sc_telemetry::TelemetryEndpoints>> { | ||
| self.base.base.telemetry_endpoints(chain_spec) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we add it to
runtime-benchmarksfeature below?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, we should, but
runtime-benchmarksis actually unused at present. It also reminds me that we might also want to actually integratetry-runtimefeature for convenient runtime upgrade testing.