Skip to content

Add support for --dev mode and allow reading chain spec from files #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmitrylavrenov merged 1 commit into from
Aug 17, 2021
Merged

Add support for --dev mode and allow reading chain spec from files #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
161 changes: 118 additions & 43 deletions crates/humanode-peer/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use humanode_runtime::{
AccountId, AuraConfig, BalancesConfig, BioauthConfig, GenesisConfig, RobonodePublicKeyWrapper,
Signature, SudoConfig, SystemConfig, WASM_BINARY,
};
use pallet_bioauth::StoredAuthTicket;
use sc_service::ChainType;
use sp_consensus_aura::sr25519::AuthorityId as AuraId;
use sp_runtime::{
Expand Down Expand Up @@ -55,49 +56,36 @@ pub fn local_testnet_config() -> Result<ChainSpec, String> {
"local_testnet",
ChainType::Local,
move || {
GenesisConfig {
system: SystemConfig {
// Add Wasm runtime to storage.
code: wasm_binary.to_vec(),
changes_trie_config: Default::default(),
},
balances: BalancesConfig {
// Configure endowed accounts with initial balance of 1 << 60.
balances: vec![
(
get_account_id_from_seed::<sr25519::Public>("Alice"),
1 << 60,
),
(
get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
1 << 60,
),
(get_account_id_from_seed::<sr25519::Public>("Bob"), 1 << 60),
(
get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
1 << 60,
),
],
},
aura: AuraConfig {
authorities: vec![
authority_keys_from_seed("Alice"),
authority_keys_from_seed("Bob"),
],
},
sudo: SudoConfig {
// Assign network admin rights.
key: get_account_id_from_seed::<sr25519::Public>("Alice"),
},
bioauth: BioauthConfig {
// Add Alice AuraId to StoredAuthTickets for producing blocks
stored_auth_tickets: vec![pallet_bioauth::StoredAuthTicket {
public_key: authority_keys_from_seed("Alice").as_slice().to_vec(),
nonce: "1".as_bytes().to_vec(),
}],
robonode_public_key,
},
}
testnet_genesis(
wasm_binary,
// Initial PoA authorities
vec![
authority_keys_from_seed("Alice"),
authority_keys_from_seed("Bob"),
],
// Sudo account
get_account_id_from_seed::<sr25519::Public>("Alice"),
// Pre-funded accounts
vec![
get_account_id_from_seed::<sr25519::Public>("Alice"),
get_account_id_from_seed::<sr25519::Public>("Bob"),
get_account_id_from_seed::<sr25519::Public>("Charlie"),
get_account_id_from_seed::<sr25519::Public>("Dave"),
get_account_id_from_seed::<sr25519::Public>("Eve"),
get_account_id_from_seed::<sr25519::Public>("Ferdie"),
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>("Charlie//stash"),
get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
],
vec![pallet_bioauth::StoredAuthTicket {
public_key: authority_keys_from_seed("Alice").as_slice().to_vec(),
nonce: "1".as_bytes().to_vec(),
}],
robonode_public_key,
)
},
// Bootnodes
vec![],
Expand All @@ -111,3 +99,90 @@ pub fn local_testnet_config() -> Result<ChainSpec, String> {
None,
))
}

/// A configuration for dev.
pub fn development_config() -> Result<ChainSpec, String> {
let wasm_binary = WASM_BINARY.ok_or_else(|| "Development wasm not available".to_string())?;

let robonode_public_key = RobonodePublicKeyWrapper::from_bytes(
&hex!("5dde03934419252d13336e5a5881f5b1ef9ea47084538eb229f86349e7f394ab")[..],
)
.map_err(|err| format!("{:?}", err))?;

Ok(ChainSpec::from_genesis(
// Name
"Development",
// ID
"dev",
ChainType::Development,
move || {
testnet_genesis(
wasm_binary,
// Initial PoA authorities
vec![authority_keys_from_seed("Alice")],
// Sudo account
get_account_id_from_seed::<sr25519::Public>("Alice"),
// Pre-funded accounts
vec![
get_account_id_from_seed::<sr25519::Public>("Alice"),
get_account_id_from_seed::<sr25519::Public>("Bob"),
get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
],
vec![pallet_bioauth::StoredAuthTicket {
public_key: authority_keys_from_seed("Alice").as_slice().to_vec(),
nonce: "1".as_bytes().to_vec(),
}],
robonode_public_key,
)
},
// Bootnodes
vec![],
// Telemetry
None,
// Protocol ID
None,
// Properties
None,
// Extensions
None,
))
}

/// Configure initial storage state for FRAME modules.
fn testnet_genesis(
wasm_binary: &[u8],
initial_authorities: Vec<AuraId>,
root_key: AccountId,
endowed_accounts: Vec<AccountId>,
stored_auth_tickets: Vec<StoredAuthTicket>,
robonode_public_key: RobonodePublicKeyWrapper,
) -> GenesisConfig {
GenesisConfig {
system: SystemConfig {
// Add Wasm runtime to storage.
code: wasm_binary.to_vec(),
changes_trie_config: Default::default(),
},
balances: BalancesConfig {
// Configure endowed accounts with initial balance of 1 << 60.
balances: endowed_accounts
.iter()
.cloned()
.map(|k| (k, 1 << 60))
.collect(),
},
aura: AuraConfig {
authorities: initial_authorities,
},
sudo: SudoConfig {
// Assign network admin rights.
key: root_key,
},
bioauth: BioauthConfig {
// Add Alice AuraId to StoredAuthTickets for producing blocks
stored_auth_tickets,
robonode_public_key,
},
}
}
15 changes: 7 additions & 8 deletions crates/humanode-peer/src/cli/root.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,13 @@ impl SubstrateCli for Root {
}

fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
if id != "local" && !id.is_empty() {
return Err(format!(
"chain {:?} is not supported, only {:?} is currently available",
id, "local"
));
}

Ok(Box::new(chain_spec::local_testnet_config()?))
Ok(match id {
"dev" => Box::new(chain_spec::development_config()?),
"" | "local" => Box::new(chain_spec::local_testnet_config()?),
path => Box::new(chain_spec::ChainSpec::from_json_file(
std::path::PathBuf::from(path),
)?),
})
}

fn native_runtime_version(_chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
Expand Down