pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 07:01:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove parachain-id cli command (#739)

Browse Source 
This was never planned to be a permanent feature. This was mainly added for testing purposes, but
now was copied by everybody. The users should be more specific about the para id and set this
properly in the chain spec.
This commit is contained in:
Bastian Köcher
2021-11-10 08:56:00 +01:00
committed by GitHub
parent eaa5a0e663
commit c6c9ee1a09
6 changed files with 70 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cumulus/client/cli/src/lib.rs
+1 -7
View File
@@ -125,10 +125,6 @@ pub struct RunCmd {
#[structopt(flatten)] #[structopt(flatten)]
pub base: sc_cli::RunCmd, pub base: sc_cli::RunCmd,
/// Id of the parachain this collator collates for.
#[structopt(long)]
pub parachain_id: Option<u32>,
/// Run node as collator. /// Run node as collator.
/// ///
/// Note that this is the same as running with `--validator`. /// Note that this is the same as running with `--validator`.
@@ -142,8 +138,6 @@ pub struct RunCmd {
pub struct NormalizedRunCmd { pub struct NormalizedRunCmd {
/// The cumulus RunCmd inherents from sc_cli's /// The cumulus RunCmd inherents from sc_cli's
pub base: sc_cli::RunCmd, pub base: sc_cli::RunCmd,
/// Id of the parachain this collator collates for.
pub parachain_id: Option<u32>,
} }
impl RunCmd { impl RunCmd {
@@ -153,7 +147,7 @@ impl RunCmd {
new_base.validator = self.base.validator || self.collator; new_base.validator = self.base.validator || self.collator;
NormalizedRunCmd { base: new_base, parachain_id: self.parachain_id } NormalizedRunCmd { base: new_base }
} }
} }
cumulus/parachain-template/node/src/chain_spec.rs
+6 -6
View File
@@ -58,7 +58,7 @@ pub fn template_session_keys(keys: AuraId) -> parachain_template_runtime::Sessio
parachain_template_runtime::SessionKeys { aura: keys } parachain_template_runtime::SessionKeys { aura: keys }
} }
pub fn development_config(id: ParaId) -> ChainSpec { pub fn development_config() -> ChainSpec {
// Give your base currency a unit name and decimal places // Give your base currency a unit name and decimal places
let mut properties = sc_chain_spec::Properties::new(); let mut properties = sc_chain_spec::Properties::new();
properties.insert("tokenSymbol".into(), "ROC".into()); properties.insert("tokenSymbol".into(), "ROC".into());
@@ -98,7 +98,7 @@ pub fn development_config(id: ParaId) -> ChainSpec {
get_account_id_from_seed::<sr25519::Public>("Eve//stash"), get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"), get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
], ],
id, 1000.into(),
) )
}, },
vec![], vec![],
@@ -107,12 +107,12 @@ pub fn development_config(id: ParaId) -> ChainSpec {
None, None,
Extensions { Extensions {
relay_chain: "rococo-local".into(), // You MUST set this to the correct network! relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
para_id: id.into(), para_id: 1000,
}, },
) )
} }
pub fn local_testnet_config(id: ParaId) -> ChainSpec { pub fn local_testnet_config() -> ChainSpec {
// Give your base currency a unit name and decimal places // Give your base currency a unit name and decimal places
let mut properties = sc_chain_spec::Properties::new(); let mut properties = sc_chain_spec::Properties::new();
properties.insert("tokenSymbol".into(), "ROC".into()); properties.insert("tokenSymbol".into(), "ROC".into());
@@ -152,7 +152,7 @@ pub fn local_testnet_config(id: ParaId) -> ChainSpec {
get_account_id_from_seed::<sr25519::Public>("Eve//stash"), get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"), get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
], ],
id, 1000.into(),
) )
}, },
// Bootnodes // Bootnodes
@@ -166,7 +166,7 @@ pub fn local_testnet_config(id: ParaId) -> ChainSpec {
// Extensions // Extensions
Extensions { Extensions {
relay_chain: "rococo-local".into(), // You MUST set this to the correct network! relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
para_id: id.into(), para_id: 1000,
}, },
) )
} }
cumulus/parachain-template/node/src/cli.rs
-6
View File
@@ -46,12 +46,6 @@ pub struct ExportGenesisStateCommand {
#[structopt(parse(from_os_str))] #[structopt(parse(from_os_str))]
pub output: Option<PathBuf>, pub output: Option<PathBuf>,
/// Id of the parachain this state is for.
///
/// Default: 100
#[structopt(long, conflicts_with = "chain")]
pub parachain_id: Option<u32>,
/// Write output in binary. Default is to write in hex. /// Write output in binary. Default is to write in hex.
#[structopt(short, long)] #[structopt(short, long)]
pub raw: bool, pub raw: bool,
cumulus/parachain-template/node/src/command.rs
+11 -15
View File
@@ -18,14 +18,11 @@ use sp_core::hexdisplay::HexDisplay;
use sp_runtime::traits::Block as BlockT; use sp_runtime::traits::Block as BlockT;
use std::{io::Write, net::SocketAddr}; use std::{io::Write, net::SocketAddr};
fn load_spec( fn load_spec(id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
id: &str,
para_id: ParaId,
) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
Ok(match id { Ok(match id {
"dev" => Box::new(chain_spec::development_config(para_id)), "dev" => Box::new(chain_spec::development_config()),
"template-rococo" => Box::new(chain_spec::local_testnet_config(para_id)), "template-rococo" => Box::new(chain_spec::local_testnet_config()),
"" | "local" => Box::new(chain_spec::local_testnet_config(para_id)), "" | "local" => Box::new(chain_spec::local_testnet_config()),
path => Box::new(chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path))?), path => Box::new(chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path))?),
}) })
} }
@@ -62,7 +59,7 @@ impl SubstrateCli for Cli {
} }
fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> { fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
load_spec(id, self.run.parachain_id.unwrap_or(2000).into()) load_spec(id)
} }
fn native_runtime_version(_: &Box<dyn ChainSpec>) -> &'static RuntimeVersion { fn native_runtime_version(_: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
@@ -194,10 +191,8 @@ pub fn run() -> Result<()> {
builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); builder.with_profiling(sc_tracing::TracingReceiver::Log, "");
let _ = builder.init(); let _ = builder.init();
let block: Block = generate_genesis_block(&load_spec( let block: Block =
&params.chain.clone().unwrap_or_default(), generate_genesis_block(&load_spec(&params.chain.clone().unwrap_or_default())?)?;
params.parachain_id.unwrap_or(2000).into(),
)?)?;
let raw_header = block.header().encode(); let raw_header = block.header().encode();
let output_buf = if params.raw { let output_buf = if params.raw {
raw_header raw_header
@@ -248,15 +243,16 @@ pub fn run() -> Result<()> {
let runner = cli.create_runner(&cli.run.normalize())?; let runner = cli.create_runner(&cli.run.normalize())?;
runner.run_node_until_exit(|config| async move { runner.run_node_until_exit(|config| async move {
let para_id = let para_id = chain_spec::Extensions::try_get(&*config.chain_spec)
chain_spec::Extensions::try_get(&*config.chain_spec).map(|e| e.para_id); .map(|e| e.para_id)
.ok_or_else(|| "Could not find parachain extension for chain-spec.")?;
let polkadot_cli = RelayChainCli::new( let polkadot_cli = RelayChainCli::new(
&config, &config,
[RelayChainCli::executable_name()].iter().chain(cli.relaychain_args.iter()), [RelayChainCli::executable_name()].iter().chain(cli.relaychain_args.iter()),
); );
let id = ParaId::from(cli.run.parachain_id.or(para_id).unwrap_or(2000)); let id = ParaId::from(para_id);
let parachain_account = let parachain_account =
AccountIdConversion::<polkadot_primitives::v0::AccountId>::into_account(&id); AccountIdConversion::<polkadot_primitives::v0::AccountId>::into_account(&id);
cumulus/polkadot-parachains/src/chain_spec.rs
+33 -33
View File
@@ -64,7 +64,7 @@ where
AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account() AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()
} }
pub fn get_chain_spec(id: ParaId) -> ChainSpec { pub fn get_chain_spec() -> ChainSpec {
ChainSpec::from_genesis( ChainSpec::from_genesis(
"Local Testnet", "Local Testnet",
"local_testnet", "local_testnet",
@@ -87,32 +87,32 @@ pub fn get_chain_spec(id: ParaId) -> ChainSpec {
get_account_id_from_seed::<sr25519::Public>("Eve//stash"), get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"), get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
], ],
id, 1000.into(),
) )
}, },
vec![], vec![],
None, None,
None, None,
None, None,
Extensions { relay_chain: "westend".into(), para_id: id.into() }, Extensions { relay_chain: "westend".into(), para_id: 1000 },
) )
} }
pub fn get_shell_chain_spec(id: ParaId) -> ShellChainSpec { pub fn get_shell_chain_spec() -> ShellChainSpec {
ShellChainSpec::from_genesis( ShellChainSpec::from_genesis(
"Shell Local Testnet", "Shell Local Testnet",
"shell_local_testnet", "shell_local_testnet",
ChainType::Local, ChainType::Local,
move || shell_testnet_genesis(id), move || shell_testnet_genesis(1000.into()),
vec![], vec![],
None, None,
None, None,
None, None,
Extensions { relay_chain: "westend".into(), para_id: id.into() }, Extensions { relay_chain: "westend".into(), para_id: 1000 },
) )
} }
pub fn staging_test_net(id: ParaId) -> ChainSpec { pub fn staging_test_net() -> ChainSpec {
ChainSpec::from_genesis( ChainSpec::from_genesis(
"Staging Testnet", "Staging Testnet",
"staging_testnet", "staging_testnet",
@@ -131,14 +131,14 @@ pub fn staging_test_net(id: ParaId) -> ChainSpec {
vec![ vec![
hex!["9ed7705e3c7da027ba0583a22a3212042f7e715d3c168ba14f1424e2bc111d00"].into() hex!["9ed7705e3c7da027ba0583a22a3212042f7e715d3c168ba14f1424e2bc111d00"].into()
], ],
id, 1000.into(),
) )
}, },
Vec::new(), Vec::new(),
None, None,
None, None,
None, None,
Extensions { relay_chain: "westend".into(), para_id: id.into() }, Extensions { relay_chain: "westend".into(), para_id: 1000 },
) )
} }
@@ -228,7 +228,7 @@ pub fn westmint_session_keys(keys: AuraId) -> westmint_runtime::SessionKeys {
westmint_runtime::SessionKeys { aura: keys } westmint_runtime::SessionKeys { aura: keys }
} }
pub fn statemint_development_config(id: ParaId) -> StatemintChainSpec { pub fn statemint_development_config() -> StatemintChainSpec {
let mut properties = sc_chain_spec::Properties::new(); let mut properties = sc_chain_spec::Properties::new();
properties.insert("tokenSymbol".into(), "DOT".into()); properties.insert("tokenSymbol".into(), "DOT".into());
properties.insert("tokenDecimals".into(), 10.into()); properties.insert("tokenDecimals".into(), 10.into());
@@ -252,18 +252,18 @@ pub fn statemint_development_config(id: ParaId) -> StatemintChainSpec {
get_account_id_from_seed::<sr25519::Public>("Alice//stash"), get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
get_account_id_from_seed::<sr25519::Public>("Bob//stash"), get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
], ],
id, 1000.into(),
) )
}, },
vec![], vec![],
None, None,
None, None,
Some(properties), Some(properties),
Extensions { relay_chain: "polkadot-dev".into(), para_id: id.into() }, Extensions { relay_chain: "polkadot-dev".into(), para_id: 1000 },
) )
} }
pub fn statemint_local_config(id: ParaId) -> StatemintChainSpec { pub fn statemint_local_config() -> StatemintChainSpec {
let mut properties = sc_chain_spec::Properties::new(); let mut properties = sc_chain_spec::Properties::new();
properties.insert("tokenSymbol".into(), "DOT".into()); properties.insert("tokenSymbol".into(), "DOT".into());
properties.insert("tokenDecimals".into(), 10.into()); properties.insert("tokenDecimals".into(), 10.into());
@@ -301,14 +301,14 @@ pub fn statemint_local_config(id: ParaId) -> StatemintChainSpec {
get_account_id_from_seed::<sr25519::Public>("Eve//stash"), get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"), get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
], ],
id, 1000.into(),
) )
}, },
vec![], vec![],
None, None,
None, None,
Some(properties), Some(properties),
Extensions { relay_chain: "polkadot-local".into(), para_id: id.into() }, Extensions { relay_chain: "polkadot-local".into(), para_id: 1000 },
) )
} }
@@ -354,7 +354,7 @@ fn statemint_genesis(
} }
} }
pub fn statemine_development_config(id: ParaId) -> StatemineChainSpec { pub fn statemine_development_config() -> StatemineChainSpec {
let mut properties = sc_chain_spec::Properties::new(); let mut properties = sc_chain_spec::Properties::new();
properties.insert("tokenSymbol".into(), "KSM".into()); properties.insert("tokenSymbol".into(), "KSM".into());
properties.insert("tokenDecimals".into(), 12.into()); properties.insert("tokenDecimals".into(), 12.into());
@@ -378,18 +378,18 @@ pub fn statemine_development_config(id: ParaId) -> StatemineChainSpec {
get_account_id_from_seed::<sr25519::Public>("Alice//stash"), get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
get_account_id_from_seed::<sr25519::Public>("Bob//stash"), get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
], ],
id, 1000.into(),
) )
}, },
vec![], vec![],
None, None,
None, None,
Some(properties), Some(properties),
Extensions { relay_chain: "kusama-dev".into(), para_id: id.into() }, Extensions { relay_chain: "kusama-dev".into(), para_id: 1000 },
) )
} }
pub fn statemine_local_config(id: ParaId) -> StatemineChainSpec { pub fn statemine_local_config() -> StatemineChainSpec {
let mut properties = sc_chain_spec::Properties::new(); let mut properties = sc_chain_spec::Properties::new();
properties.insert("tokenSymbol".into(), "KSM".into()); properties.insert("tokenSymbol".into(), "KSM".into());
properties.insert("tokenDecimals".into(), 12.into()); properties.insert("tokenDecimals".into(), 12.into());
@@ -427,18 +427,18 @@ pub fn statemine_local_config(id: ParaId) -> StatemineChainSpec {
get_account_id_from_seed::<sr25519::Public>("Eve//stash"), get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"), get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
], ],
id, 1000.into(),
) )
}, },
vec![], vec![],
None, None,
None, None,
Some(properties), Some(properties),
Extensions { relay_chain: "kusama-local".into(), para_id: id.into() }, Extensions { relay_chain: "kusama-local".into(), para_id: 1000 },
) )
} }
pub fn statemine_config(id: ParaId) -> StatemineChainSpec { pub fn statemine_config() -> StatemineChainSpec {
let mut properties = sc_chain_spec::Properties::new(); let mut properties = sc_chain_spec::Properties::new();
properties.insert("tokenSymbol".into(), "KSM".into()); properties.insert("tokenSymbol".into(), "KSM".into());
properties.insert("tokenDecimals".into(), 12.into()); properties.insert("tokenDecimals".into(), 12.into());
@@ -479,14 +479,14 @@ pub fn statemine_config(id: ParaId) -> StatemineChainSpec {
), ),
], ],
vec![], vec![],
id, 1000.into(),
) )
}, },
vec![], vec![],
None, None,
None, None,
Some(properties), Some(properties),
Extensions { relay_chain: "kusama".into(), para_id: id.into() }, Extensions { relay_chain: "kusama".into(), para_id: 1000 },
) )
} }
@@ -530,7 +530,7 @@ fn statemine_genesis(
} }
} }
pub fn westmint_development_config(id: ParaId) -> WestmintChainSpec { pub fn westmint_development_config() -> WestmintChainSpec {
let mut properties = sc_chain_spec::Properties::new(); let mut properties = sc_chain_spec::Properties::new();
properties.insert("tokenSymbol".into(), "WND".into()); properties.insert("tokenSymbol".into(), "WND".into());
properties.insert("tokenDecimals".into(), 12.into()); properties.insert("tokenDecimals".into(), 12.into());
@@ -555,18 +555,18 @@ pub fn westmint_development_config(id: ParaId) -> WestmintChainSpec {
get_account_id_from_seed::<sr25519::Public>("Bob//stash"), get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
], ],
get_account_id_from_seed::<sr25519::Public>("Alice"), get_account_id_from_seed::<sr25519::Public>("Alice"),
id, 1000.into(),
) )
}, },
vec![], vec![],
None, None,
None, None,
Some(properties), Some(properties),
Extensions { relay_chain: "westend".into(), para_id: id.into() }, Extensions { relay_chain: "westend".into(), para_id: 1000 },
) )
} }
pub fn westmint_local_config(id: ParaId) -> WestmintChainSpec { pub fn westmint_local_config() -> WestmintChainSpec {
let mut properties = sc_chain_spec::Properties::new(); let mut properties = sc_chain_spec::Properties::new();
properties.insert("tokenSymbol".into(), "WND".into()); properties.insert("tokenSymbol".into(), "WND".into());
properties.insert("tokenDecimals".into(), 12.into()); properties.insert("tokenDecimals".into(), 12.into());
@@ -605,18 +605,18 @@ pub fn westmint_local_config(id: ParaId) -> WestmintChainSpec {
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"), get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
], ],
get_account_id_from_seed::<sr25519::Public>("Alice"), get_account_id_from_seed::<sr25519::Public>("Alice"),
id, 1000.into(),
) )
}, },
vec![], vec![],
None, None,
None, None,
Some(properties), Some(properties),
Extensions { relay_chain: "westend-local".into(), para_id: id.into() }, Extensions { relay_chain: "westend-local".into(), para_id: 1000 },
) )
} }
pub fn westmint_config(id: ParaId) -> WestmintChainSpec { pub fn westmint_config() -> WestmintChainSpec {
let mut properties = sc_chain_spec::Properties::new(); let mut properties = sc_chain_spec::Properties::new();
properties.insert("tokenSymbol".into(), "WND".into()); properties.insert("tokenSymbol".into(), "WND".into());
properties.insert("tokenDecimals".into(), 12.into()); properties.insert("tokenDecimals".into(), 12.into());
@@ -659,14 +659,14 @@ pub fn westmint_config(id: ParaId) -> WestmintChainSpec {
vec![], vec![],
// re-use the Westend sudo key // re-use the Westend sudo key
hex!("6648d7f3382690650c681aba1b993cd11e54deb4df21a3a18c3e2177de9f7342").into(), hex!("6648d7f3382690650c681aba1b993cd11e54deb4df21a3a18c3e2177de9f7342").into(),
id, 1000.into(),
) )
}, },
vec![], vec![],
None, None,
None, None,
Some(properties), Some(properties),
Extensions { relay_chain: "westend".into(), para_id: id.into() }, Extensions { relay_chain: "westend".into(), para_id: 1000 },
) )
} }
cumulus/polkadot-parachains/src/command.rs
+19 -26
View File
@@ -36,9 +36,6 @@ use sp_core::hexdisplay::HexDisplay;
use sp_runtime::traits::Block as BlockT; use sp_runtime::traits::Block as BlockT;
use std::{io::Write, net::SocketAddr}; use std::{io::Write, net::SocketAddr};
// default to the Statemint/Statemine/Westmint id
const DEFAULT_PARA_ID: u32 = 1000;
trait IdentifyChain { trait IdentifyChain {
fn is_shell(&self) -> bool; fn is_shell(&self) -> bool;
fn is_statemint(&self) -> bool; fn is_statemint(&self) -> bool;
@@ -76,12 +73,9 @@ impl<T: sc_service::ChainSpec + 'static> IdentifyChain for T {
} }
} }
fn load_spec( fn load_spec(id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
id: &str,
para_id: ParaId,
) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
Ok(match id { Ok(match id {
"staging" => Box::new(chain_spec::staging_test_net(para_id)), "staging" => Box::new(chain_spec::staging_test_net()),
"tick" => Box::new(chain_spec::ChainSpec::from_json_bytes( "tick" => Box::new(chain_spec::ChainSpec::from_json_bytes(
&include_bytes!("../res/tick.json")[..], &include_bytes!("../res/tick.json")[..],
)?), )?),
@@ -91,26 +85,26 @@ fn load_spec(
"track" => Box::new(chain_spec::ChainSpec::from_json_bytes( "track" => Box::new(chain_spec::ChainSpec::from_json_bytes(
&include_bytes!("../res/track.json")[..], &include_bytes!("../res/track.json")[..],
)?), )?),
"shell" => Box::new(chain_spec::get_shell_chain_spec(para_id)), "shell" => Box::new(chain_spec::get_shell_chain_spec()),
"statemint-dev" => Box::new(chain_spec::statemint_development_config(para_id)), "statemint-dev" => Box::new(chain_spec::statemint_development_config()),
"statemint-local" => Box::new(chain_spec::statemint_local_config(para_id)), "statemint-local" => Box::new(chain_spec::statemint_local_config()),
"statemine-dev" => Box::new(chain_spec::statemine_development_config(para_id)), "statemine-dev" => Box::new(chain_spec::statemine_development_config()),
"statemine-local" => Box::new(chain_spec::statemine_local_config(para_id)), "statemine-local" => Box::new(chain_spec::statemine_local_config()),
// the chain spec as used for generating the upgrade genesis values // the chain spec as used for generating the upgrade genesis values
"statemine-genesis" => Box::new(chain_spec::statemine_config(para_id)), "statemine-genesis" => Box::new(chain_spec::statemine_config()),
// the shell-based chain spec as used for syncing // the shell-based chain spec as used for syncing
"statemine" => Box::new(chain_spec::ChainSpec::from_json_bytes( "statemine" => Box::new(chain_spec::ChainSpec::from_json_bytes(
&include_bytes!("../res/statemine.json")[..], &include_bytes!("../res/statemine.json")[..],
)?), )?),
"westmint-dev" => Box::new(chain_spec::westmint_development_config(para_id)), "westmint-dev" => Box::new(chain_spec::westmint_development_config()),
"westmint-local" => Box::new(chain_spec::westmint_local_config(para_id)), "westmint-local" => Box::new(chain_spec::westmint_local_config()),
// the chain spec as used for generating the upgrade genesis values // the chain spec as used for generating the upgrade genesis values
"westmint-genesis" => Box::new(chain_spec::westmint_config(para_id)), "westmint-genesis" => Box::new(chain_spec::westmint_config()),
// the shell-based chain spec as used for syncing // the shell-based chain spec as used for syncing
"westmint" => Box::new(chain_spec::ChainSpec::from_json_bytes( "westmint" => Box::new(chain_spec::ChainSpec::from_json_bytes(
&include_bytes!("../res/westmint.json")[..], &include_bytes!("../res/westmint.json")[..],
)?), )?),
"" => Box::new(chain_spec::get_chain_spec(para_id)), "" => Box::new(chain_spec::get_chain_spec()),
path => { path => {
let chain_spec = chain_spec::ChainSpec::from_json_file(path.into())?; let chain_spec = chain_spec::ChainSpec::from_json_file(path.into())?;
if chain_spec.is_statemint() { if chain_spec.is_statemint() {
@@ -160,7 +154,7 @@ impl SubstrateCli for Cli {
} }
fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> { fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
load_spec(id, self.run.parachain_id.unwrap_or(DEFAULT_PARA_ID).into()) load_spec(id)
} }
fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion { fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
@@ -342,10 +336,8 @@ pub fn run() -> Result<()> {
builder.with_profiling(sc_tracing::TracingReceiver::Log, ""); builder.with_profiling(sc_tracing::TracingReceiver::Log, "");
let _ = builder.init(); let _ = builder.init();
let block: crate::service::Block = generate_genesis_block(&load_spec( let block: crate::service::Block =
&params.chain.clone().unwrap_or_default(), generate_genesis_block(&load_spec(&params.chain.clone().unwrap_or_default())?)?;
params.parachain_id.unwrap_or(DEFAULT_PARA_ID).into(),
)?)?;
let raw_header = block.header().encode(); let raw_header = block.header().encode();
let output_buf = if params.raw { let output_buf = if params.raw {
raw_header raw_header
@@ -404,8 +396,9 @@ pub fn run() -> Result<()> {
let runner = cli.create_runner(&cli.run.normalize())?; let runner = cli.create_runner(&cli.run.normalize())?;
runner.run_node_until_exit(|config| async move { runner.run_node_until_exit(|config| async move {
let para_id = let para_id = chain_spec::Extensions::try_get(&*config.chain_spec)
chain_spec::Extensions::try_get(&*config.chain_spec).map(|e| e.para_id); .map(|e| e.para_id)
.ok_or_else(|| "Could not find parachain extension in chain-spec.")?;
let polkadot_cli = RelayChainCli::new( let polkadot_cli = RelayChainCli::new(
&config, &config,
@@ -414,7 +407,7 @@ pub fn run() -> Result<()> {
.chain(cli.relaychain_args.iter()), .chain(cli.relaychain_args.iter()),
); );
let id = ParaId::from(cli.run.parachain_id.or(para_id).unwrap_or(DEFAULT_PARA_ID)); let id = ParaId::from(para_id);
let parachain_account = let parachain_account =
AccountIdConversion::<polkadot_primitives::v0::AccountId>::into_account(&id); AccountIdConversion::<polkadot_primitives::v0::AccountId>::into_account(&id);