-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #32 from OriginTrail/upgrade/103/dependecy-update
Runtime and client upgrade 1.0.3 for Mainnet - Polkadot v0.9.27 dependencies update
- Loading branch information
Showing
10 changed files
with
3,599 additions
and
3,745 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -1,118 +1,100 @@ | ||
| use crate::chain_spec; | ||
| use clap::Parser; | ||
| use std::path::PathBuf; | ||
|
|
||
| /// Sub-commands supported by the collator. | ||
| #[derive(Debug, clap::Subcommand)] | ||
| pub enum Subcommand { | ||
| /// Export the genesis state of the parachain. | ||
| #[clap(name = "export-genesis-state")] | ||
| ExportGenesisState(ExportGenesisStateCommand), | ||
| /// Build a chain specification. | ||
| BuildSpec(sc_cli::BuildSpecCmd), | ||
|
|
||
| /// Export the genesis wasm of the parachain. | ||
| #[clap(name = "export-genesis-wasm")] | ||
| ExportGenesisWasm(ExportGenesisWasmCommand), | ||
|
|
||
| /// Build a chain specification. | ||
| BuildSpec(sc_cli::BuildSpecCmd), | ||
|
|
||
| /// Validate blocks. | ||
| CheckBlock(sc_cli::CheckBlockCmd), | ||
|
|
||
| /// Export blocks. | ||
| ExportBlocks(sc_cli::ExportBlocksCmd), | ||
| /// Validate blocks. | ||
| CheckBlock(sc_cli::CheckBlockCmd), | ||
|
|
||
| /// Export the state of a given block into a chain spec. | ||
| ExportState(sc_cli::ExportStateCmd), | ||
| /// Export blocks. | ||
| ExportBlocks(sc_cli::ExportBlocksCmd), | ||
|
|
||
| /// Import blocks. | ||
| ImportBlocks(sc_cli::ImportBlocksCmd), | ||
| /// Export the state of a given block into a chain spec. | ||
| ExportState(sc_cli::ExportStateCmd), | ||
|
|
||
| /// Remove the whole chain. | ||
| PurgeChain(cumulus_client_cli::PurgeChainCmd), | ||
| /// Import blocks. | ||
| ImportBlocks(sc_cli::ImportBlocksCmd), | ||
|
|
||
| /// Revert the chain to a previous state. | ||
| /// Revert the chain to a previous state. | ||
| Revert(sc_cli::RevertCmd), | ||
|
|
||
| /// The custom benchmark subcommmand benchmarking runtime pallets. | ||
| #[clap(name = "benchmark", about = "Benchmark runtime pallets.")] | ||
| Benchmark(frame_benchmarking_cli::BenchmarkCmd), | ||
|
|
||
| /// Try some testing command against a specified runtime state. | ||
| TryRuntime(try_runtime_cli::TryRuntimeCmd), | ||
| } | ||
|
|
||
| /// Command for exporting the genesis state of the parachain | ||
| #[derive(Debug, Parser)] | ||
| pub struct ExportGenesisStateCommand { | ||
| /// Output file name or stdout if unspecified. | ||
| #[clap(parse(from_os_str))] | ||
| pub output: Option<PathBuf>, | ||
| /// Remove the whole chain. | ||
| PurgeChain(cumulus_client_cli::PurgeChainCmd), | ||
|
|
||
| /// Write output in binary. Default is to write in hex. | ||
| #[clap(short, long)] | ||
| pub raw: bool, | ||
| /// Export the genesis state of the parachain. | ||
| ExportGenesisState(cumulus_client_cli::ExportGenesisStateCommand), | ||
|
|
||
| /// The name of the chain for that the genesis state should be exported. | ||
| #[clap(long)] | ||
| pub chain: Option<String>, | ||
| } | ||
|
|
||
| /// Command for exporting the genesis wasm file. | ||
| #[derive(Debug, Parser)] | ||
| pub struct ExportGenesisWasmCommand { | ||
| /// Output file name or stdout if unspecified. | ||
| #[clap(parse(from_os_str))] | ||
| pub output: Option<PathBuf>, | ||
| /// Export the genesis wasm of the parachain. | ||
| ExportGenesisWasm(cumulus_client_cli::ExportGenesisWasmCommand), | ||
|
|
||
| /// Write output in binary. Default is to write in hex. | ||
| #[clap(short, long)] | ||
| pub raw: bool, | ||
| /// Sub-commands concerned with benchmarking. | ||
| /// The pallet benchmarking moved to the `pallet` sub-command. | ||
| #[clap(subcommand)] | ||
| Benchmark(frame_benchmarking_cli::BenchmarkCmd), | ||
|
|
||
| /// The name of the chain for that the genesis wasm file should be exported. | ||
| #[clap(long)] | ||
| pub chain: Option<String>, | ||
| /// Try some testing command against a specified runtime state. | ||
| TryRuntime(try_runtime_cli::TryRuntimeCmd), | ||
| } | ||
|
|
||
| #[derive(Debug, Parser)] | ||
| #[derive(Debug, clap::Parser)] | ||
| #[clap( | ||
| propagate_version = true, | ||
| args_conflicts_with_subcommands = true, | ||
| subcommand_negates_reqs = true | ||
| propagate_version = true, | ||
| args_conflicts_with_subcommands = true, | ||
| subcommand_negates_reqs = true | ||
| )] | ||
| pub struct Cli { | ||
| #[clap(subcommand)] | ||
| pub subcommand: Option<Subcommand>, | ||
|
|
||
| #[clap(flatten)] | ||
| pub run: cumulus_client_cli::RunCmd, | ||
| #[clap(subcommand)] | ||
| pub subcommand: Option<Subcommand>, | ||
|
|
||
| #[clap(flatten)] | ||
| pub run: cumulus_client_cli::RunCmd, | ||
|
|
||
| /// Disable automatic hardware benchmarks. | ||
| /// | ||
| /// By default these benchmarks are automatically ran at startup and measure | ||
| /// the CPU speed, the memory bandwidth and the disk speed. | ||
| /// | ||
| /// The results are then printed out in the logs, and also sent as part of | ||
| /// telemetry, if telemetry is enabled. | ||
| #[clap(long)] | ||
| pub no_hardware_benchmarks: bool, | ||
|
|
||
| /// Relay chain arguments | ||
| #[clap(raw = true)] | ||
| pub relay_chain_args: Vec<String>, | ||
| /// Relay chain arguments | ||
| #[clap(raw = true)] | ||
| pub relay_chain_args: Vec<String>, | ||
| } | ||
|
|
||
| #[derive(Debug)] | ||
| pub struct RelayChainCli { | ||
| /// The actual relay chain cli object. | ||
| pub base: polkadot_cli::RunCmd, | ||
| /// The actual relay chain cli object. | ||
| pub base: polkadot_cli::RunCmd, | ||
|
|
||
| /// Optional chain id that should be passed to the relay chain. | ||
| pub chain_id: Option<String>, | ||
| /// Optional chain id that should be passed to the relay chain. | ||
| pub chain_id: Option<String>, | ||
|
|
||
| /// The base path that should be used by the relay chain. | ||
| pub base_path: Option<PathBuf>, | ||
| /// The base path that should be used by the relay chain. | ||
| pub base_path: Option<PathBuf>, | ||
| } | ||
|
|
||
| impl RelayChainCli { | ||
| /// Parse the relay chain CLI parameters using the para chain `Configuration`. | ||
| pub fn new<'a>( | ||
| para_config: &sc_service::Configuration, | ||
| relay_chain_args: impl Iterator<Item = &'a String>, | ||
| ) -> Self { | ||
| let extension = chain_spec::Extensions::try_get(&*para_config.chain_spec); | ||
| let chain_id = extension.map(|e| e.relay_chain.clone()); | ||
| let base_path = para_config.base_path.as_ref().map(|x| x.path().join("polkadot")); | ||
| Self { base_path, chain_id, base: polkadot_cli::RunCmd::parse_from(relay_chain_args) } | ||
| } | ||
| /// Parse the relay chain CLI parameters using the para chain `Configuration`. | ||
| pub fn new<'a>( | ||
| para_config: &sc_service::Configuration, | ||
| relay_chain_args: impl Iterator<Item = &'a String>, | ||
| ) -> Self { | ||
| let extension = crate::chain_spec::Extensions::try_get(&*para_config.chain_spec); | ||
| let chain_id = extension.map(|e| e.relay_chain.clone()); | ||
| let base_path = para_config | ||
| .base_path | ||
| .as_ref() | ||
| .map(|x| x.path().join("polkadot")); | ||
| Self { | ||
| base_path, | ||
| chain_id, | ||
| base: clap::Parser::parse_from(relay_chain_args), | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.