Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 25 additions & 19 deletions node/service/src/chain_spec/bifrost.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ use std::{

use bifrost_runtime::{
constants::currency::DOLLARS, AccountId, AuraId, Balance, BalancesConfig, BlockNumber,
CollatorSelectionConfig, CouncilConfig, DemocracyConfig, GenesisConfig, IndicesConfig,
ParachainInfoConfig, SessionConfig, SystemConfig, TechnicalCommitteeConfig, TokensConfig,
VestingConfig, WASM_BINARY,
CollatorSelectionConfig, CouncilConfig, CouncilMembershipConfig, DemocracyConfig,
GenesisConfig, IndicesConfig, ParachainInfoConfig, SessionConfig, SystemConfig,
TechnicalCommitteeConfig, TechnicalMembershipConfig, TokensConfig, VestingConfig, WASM_BINARY,
};
use cumulus_primitives_core::ParaId;
use frame_benchmarking::{account, whitelisted_caller};
Expand Down Expand Up @@ -54,8 +54,8 @@ pub fn bifrost_genesis(
vestings: Vec<(AccountId, BlockNumber, BlockNumber, Balance)>,
id: ParaId,
tokens: Vec<(AccountId, CurrencyId, Balance)>,
council: Vec<AccountId>,
technical_committee: Vec<AccountId>,
council_membership: Vec<AccountId>,
technical_committee_membership: Vec<AccountId>,
) -> GenesisConfig {
GenesisConfig {
system: SystemConfig {
Expand All @@ -65,13 +65,19 @@ pub fn bifrost_genesis(
balances: BalancesConfig { balances },
indices: IndicesConfig { indices: vec![] },
democracy: DemocracyConfig::default(),
council: CouncilConfig { members: council, phantom: Default::default() },
council_membership: CouncilMembershipConfig {
members: council_membership,
phantom: Default::default(),
},
technical_membership: TechnicalMembershipConfig {
members: technical_committee_membership,
phantom: Default::default(),
},
council: CouncilConfig { members: vec![], phantom: Default::default() },
technical_committee: TechnicalCommitteeConfig {
members: technical_committee,
members: vec![],
phantom: Default::default(),
},
council_membership: Default::default(),
technical_membership: Default::default(),
treasury: Default::default(),
phragmen_election: Default::default(),
parachain_info: ParachainInfoConfig { parachain_id: id },
Expand Down Expand Up @@ -123,8 +129,8 @@ fn development_config_genesis(id: ParaId) -> GenesisConfig {
})
.collect();

let council = vec![get_account_id_from_seed::<sr25519::Public>("Alice")];
let technical_committee = vec![get_account_id_from_seed::<sr25519::Public>("Alice")];
let council_membership = vec![get_account_id_from_seed::<sr25519::Public>("Alice")];
let technical_committee_membership = vec![get_account_id_from_seed::<sr25519::Public>("Alice")];

bifrost_genesis(
vec![(
Expand All @@ -135,8 +141,8 @@ fn development_config_genesis(id: ParaId) -> GenesisConfig {
vestings,
id,
tokens,
council,
technical_committee,
council_membership,
technical_committee_membership,
)
}

Expand Down Expand Up @@ -194,8 +200,8 @@ fn local_config_genesis(id: ParaId) -> GenesisConfig {
})
.collect();

let council = vec![get_account_id_from_seed::<sr25519::Public>("Alice")];
let technical_committee = vec![get_account_id_from_seed::<sr25519::Public>("Alice")];
let council_membership = vec![get_account_id_from_seed::<sr25519::Public>("Alice")];
let technical_committee_membership = vec![get_account_id_from_seed::<sr25519::Public>("Alice")];

bifrost_genesis(
vec![
Expand All @@ -209,8 +215,8 @@ fn local_config_genesis(id: ParaId) -> GenesisConfig {
vestings,
id,
tokens,
council,
technical_committee,
council_membership,
technical_committee_membership,
)
}

Expand Down Expand Up @@ -317,8 +323,8 @@ fn bifrost_config_genesis(id: ParaId) -> GenesisConfig {
vesting_configs.into_iter().flat_map(|vc| vc.vesting).collect(),
id,
vec![], // tokens
vec![], // council
vec![], // technical committee
vec![], // council membership
vec![], // technical committee membership
)
}

Expand Down