pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 08:47:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add nominators option to chain-spec-builder (#8502)

Browse Source 
* Add nominators option to chain-spec-builder

* Update bin/utils/chain-spec-builder/src/main.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
Kian Paimani
2021-04-05 14:30:30 +02:00
committed by GitHub
parent 4e334f59d6
commit 6d26adce01
3 changed files with 98 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/bin/utils/chain-spec-builder/src/main.rs
+62 -35
View File
@@ -41,6 +41,10 @@ enum ChainSpecBuilder {
/// Authority key seed.
#[structopt(long, short, required = true)]
authority_seeds: Vec<String>,
/// Active nominators (SS58 format), each backing a random subset of the aforementioned
/// authorities.
#[structopt(long, short, default_value = "0")]
nominator_accounts: Vec<String>,
/// Endowed account address (SS58 format).
#[structopt(long, short)]
endowed_accounts: Vec<String>,
@@ -57,6 +61,11 @@ enum ChainSpecBuilder {
/// The number of authorities.
#[structopt(long, short)]
authorities: usize,
/// The number of nominators backing the aforementioned authorities.
///
/// Will nominate a random subset of `authorities`.
#[structopt(long, short, default_value = "0")]
nominators: usize,
/// The number of endowed accounts.
#[structopt(long, short, default_value = "0")]
endowed: usize,
@@ -87,6 +96,7 @@ impl ChainSpecBuilder {
fn genesis_constructor(
authority_seeds: &[String],
nominator_accounts: &[AccountId],
endowed_accounts: &[AccountId],
sudo_account: &AccountId,
) -> chain_spec::GenesisConfig {
@@ -100,6 +110,7 @@ fn genesis_constructor(
chain_spec::testnet_genesis(
authorities,
nominator_accounts.to_vec(),
sudo_account.clone(),
Some(endowed_accounts.to_vec()),
enable_println,
@@ -108,26 +119,28 @@ fn genesis_constructor(
fn generate_chain_spec(
authority_seeds: Vec<String>,
nominator_accounts: Vec<String>,
endowed_accounts: Vec<String>,
sudo_account: String,
) -> Result<String, String> {
let parse_account = |address: &String| {
AccountId::from_string(address)
let parse_account = |address: String| {
AccountId::from_string(&address)
.map_err(|err| format!("Failed to parse account address: {:?}", err))
};
let endowed_accounts = endowed_accounts
.iter()
.map(parse_account)
.collect::<Result<Vec<_>, String>>()?;
let nominator_accounts =
nominator_accounts.into_iter().map(parse_account).collect::<Result<Vec<_>, String>>()?;
let sudo_account = parse_account(&sudo_account)?;
let endowed_accounts =
endowed_accounts.into_iter().map(parse_account).collect::<Result<Vec<_>, String>>()?;
let sudo_account = parse_account(sudo_account)?;
let chain_spec = chain_spec::ChainSpec::from_genesis(
"Custom",
"custom",
sc_chain_spec::ChainType::Live,
move || genesis_constructor(&authority_seeds, &endowed_accounts, &sudo_account),
move || genesis_constructor(&authority_seeds, &nominator_accounts, &endowed_accounts, &sudo_account),
vec![],
None,
None,
@@ -186,6 +199,7 @@ fn generate_authority_keys_and_store(
fn print_seeds(
authority_seeds: &[String],
nominator_seeds: &[String],
endowed_seeds: &[String],
sudo_seed: &str,
) {
@@ -201,6 +215,12 @@ fn print_seeds(
);
}
println!("{}", header.paint("Nominator seeds"));
for (n, seed) in nominator_seeds.iter().enumerate() {
println!("{} //{}", entry.paint(format!("nom-{}:", n)), seed);
}
println!();
if !endowed_seeds.is_empty() {
@@ -220,34 +240,27 @@ fn print_seeds(
}
fn main() -> Result<(), String> {
#[cfg(build_type="debug")]
#[cfg(build_type = "debug")]
println!(
"The chain spec builder builds a chain specification that includes a Substrate runtime compiled as WASM. To \
ensure proper functioning of the included runtime compile (or run) the chain spec builder binary in \
`--release` mode.\n",
"The chain spec builder builds a chain specification that includes a Substrate runtime \
compiled as WASM. To ensure proper functioning of the included runtime compile (or run) \
the chain spec builder binary in `--release` mode.\n",
);
let builder = ChainSpecBuilder::from_args();
let chain_spec_path = builder.chain_spec_path().to_path_buf();
let (authority_seeds, endowed_accounts, sudo_account) = match builder {
ChainSpecBuilder::Generate { authorities, endowed, keystore_path, .. } => {
let (authority_seeds, nominator_accounts, endowed_accounts, sudo_account) = match builder {
ChainSpecBuilder::Generate { authorities, nominators, endowed, keystore_path, .. } => {
let authorities = authorities.max(1);
let rand_str = || -> String {
OsRng.sample_iter(&Alphanumeric)
.take(32)
.collect()
};
let rand_str = || -> String { OsRng.sample_iter(&Alphanumeric).take(32).collect() };
let authority_seeds = (0..authorities).map(|_| rand_str()).collect::<Vec<_>>();
let nominator_seeds = (0..nominators).map(|_| rand_str()).collect::<Vec<_>>();
let endowed_seeds = (0..endowed).map(|_| rand_str()).collect::<Vec<_>>();
let sudo_seed = rand_str();
print_seeds(
&authority_seeds,
&endowed_seeds,
&sudo_seed,
);
print_seeds(&authority_seeds, &nominator_seeds, &endowed_seeds, &sudo_seed);
if let Some(keystore_path) = keystore_path {
generate_authority_keys_and_store(
@@ -256,23 +269,37 @@ fn main() -> Result<(), String> {
)?;
}
let endowed_accounts = endowed_seeds.iter().map(|seed| {
chain_spec::get_account_id_from_seed::<sr25519::Public>(seed)
.to_ss58check()
}).collect();
let nominator_accounts = nominator_seeds
.into_iter()
.map(|seed| {
chain_spec::get_account_id_from_seed::<sr25519::Public>(&seed).to_ss58check()
})
.collect();
let sudo_account = chain_spec::get_account_id_from_seed::<sr25519::Public>(&sudo_seed)
.to_ss58check();
let endowed_accounts = endowed_seeds
.into_iter()
.map(|seed| {
chain_spec::get_account_id_from_seed::<sr25519::Public>(&seed).to_ss58check()
})
.collect();
(authority_seeds, endowed_accounts, sudo_account)
},
ChainSpecBuilder::New { authority_seeds, endowed_accounts, sudo_account, .. } => {
(authority_seeds, endowed_accounts, sudo_account)
},
let sudo_account =
chain_spec::get_account_id_from_seed::<sr25519::Public>(&sudo_seed).to_ss58check();
(authority_seeds, nominator_accounts, endowed_accounts, sudo_account)
}
ChainSpecBuilder::New {
authority_seeds,
nominator_accounts,
endowed_accounts,
sudo_account,
..
} => (authority_seeds, nominator_accounts, endowed_accounts, sudo_account),
};
let json = generate_chain_spec(
authority_seeds,
nominator_accounts,
endowed_accounts,
sudo_account,
)?;