mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-07-04 11:37:24 +00:00
8683bbeefb
Closes #2326. This PR both fixes a logic bug and replaces an incorrect name. ## Bug Fix: Respecting custom genesis builder Prior to this PR the standard logic for creating a genesis block was repeated inside of cumulus. This PR removes that duplicated logic, and calls into the proper `BuildGenesisBlock` implementation. One consequence is that if the genesis block has already been initialized, it will not be re-created, but rather read from the database like it is for other node invocations. So you need to watch out for old unpurged data during the development process. Offchain tools may need to be updated accordingly. I've already filed https://github.com/paritytech/zombienet/issues/1519 ## Rename: It doesn't export state. It exports head data. The name export-genesis-state was always wrong, nad it's never too late to right a wrong. I've changed the name of the struct to `ExportGenesisHeadCommand`. There is still the question of what to do with individual nodes' public CLIs. I have updated the parachain template to a reasonable default that preserves compatibility with tools that will expect `export-genesis-state` to still work. And I've chosen not to modify the public CLIs of any other nodes in the repo. I'll leave it up to their individual owners/maintains to decide whether that is appropriate. --------- Co-authored-by: Joshy Orndorff <git-user-email.h0ly5@simplelogin.com> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: Bastian Köcher <info@kchr.de>
129 lines
4.0 KiB
Rust
129 lines
4.0 KiB
Rust
// Copyright (C) Parity Technologies (UK) Ltd.
|
|
// This file is part of Cumulus.
|
|
|
|
// Cumulus is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Cumulus is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Cumulus. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
mod cli;
|
|
|
|
use std::sync::Arc;
|
|
|
|
use cli::{RelayChainCli, Subcommand, TestCollatorCli};
|
|
use cumulus_primitives_core::{relay_chain::CollatorPair, ParaId};
|
|
use cumulus_test_service::{new_partial, AnnounceBlockFn};
|
|
use polkadot_service::runtime_traits::AccountIdConversion;
|
|
use sc_cli::{CliConfiguration, SubstrateCli};
|
|
use sp_core::Pair;
|
|
|
|
pub fn wrap_announce_block() -> Box<dyn FnOnce(AnnounceBlockFn) -> AnnounceBlockFn> {
|
|
tracing::info!("Block announcements disabled.");
|
|
Box::new(|_| {
|
|
// Never announce any block
|
|
Arc::new(|_, _| {})
|
|
})
|
|
}
|
|
|
|
fn main() -> Result<(), sc_cli::Error> {
|
|
let cli = TestCollatorCli::from_args();
|
|
|
|
match &cli.subcommand {
|
|
Some(Subcommand::BuildSpec(cmd)) => {
|
|
let runner = cli.create_runner(cmd)?;
|
|
runner.sync_run(|config| cmd.run(config.chain_spec, config.network))
|
|
},
|
|
|
|
Some(Subcommand::ExportGenesisHead(cmd)) => {
|
|
let runner = cli.create_runner(cmd)?;
|
|
runner.sync_run(|mut config| {
|
|
let partial = new_partial(&mut config, false)?;
|
|
cmd.run(partial.client)
|
|
})
|
|
},
|
|
Some(Subcommand::ExportGenesisWasm(cmd)) => {
|
|
let runner = cli.create_runner(cmd)?;
|
|
runner.sync_run(|config| cmd.run(&*config.chain_spec))
|
|
},
|
|
None => {
|
|
let log_filters = cli.run.normalize().log_filters();
|
|
let mut builder = sc_cli::LoggerBuilder::new(log_filters.unwrap_or_default());
|
|
builder.with_colors(true);
|
|
let _ = builder.init();
|
|
|
|
let collator_options = cli.run.collator_options();
|
|
let tokio_runtime = sc_cli::build_runtime()?;
|
|
let tokio_handle = tokio_runtime.handle();
|
|
let config = cli
|
|
.run
|
|
.normalize()
|
|
.create_configuration(&cli, tokio_handle.clone())
|
|
.expect("Should be able to generate config");
|
|
|
|
let parachain_id = ParaId::from(cli.parachain_id);
|
|
let polkadot_cli = RelayChainCli::new(
|
|
&config,
|
|
[RelayChainCli::executable_name()].iter().chain(cli.relaychain_args.iter()),
|
|
);
|
|
|
|
let parachain_account =
|
|
AccountIdConversion::<polkadot_primitives::AccountId>::into_account_truncating(
|
|
¶chain_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))?;
|
|
|
|
tracing::info!("Parachain id: {:?}", parachain_id);
|
|
tracing::info!("Parachain Account: {}", parachain_account);
|
|
tracing::info!(
|
|
"Is collating: {}",
|
|
if config.role.is_authority() { "yes" } else { "no" }
|
|
);
|
|
if cli.fail_pov_recovery {
|
|
tracing::info!("PoV recovery failure enabled");
|
|
}
|
|
|
|
let collator_key = config.role.is_authority().then(|| CollatorPair::generate().0);
|
|
|
|
let consensus = cli
|
|
.use_null_consensus
|
|
.then(|| {
|
|
tracing::info!("Using null consensus.");
|
|
cumulus_test_service::Consensus::Null
|
|
})
|
|
.unwrap_or(cumulus_test_service::Consensus::RelayChain);
|
|
|
|
let (mut task_manager, _, _, _, _, _) = tokio_runtime
|
|
.block_on(cumulus_test_service::start_node_impl(
|
|
config,
|
|
collator_key,
|
|
polkadot_config,
|
|
parachain_id,
|
|
cli.disable_block_announcements.then(wrap_announce_block),
|
|
cli.fail_pov_recovery,
|
|
|_| Ok(jsonrpsee::RpcModule::new(())),
|
|
consensus,
|
|
collator_options,
|
|
true,
|
|
))
|
|
.expect("could not create Cumulus test service");
|
|
|
|
tokio_runtime
|
|
.block_on(task_manager.future())
|
|
.expect("Could not run service to completion");
|
|
Ok(())
|
|
},
|
|
}
|
|
}
|