From a4784c0c89a33f51a3c7ab96091597b71d5bb501 Mon Sep 17 00:00:00 2001
From: herryho <herry.heyi@gmail.com>
Date: Sat, 18 Sep 2021 18:14:21 +0800
Subject: [PATCH] opt bifrost_local chainspec

---
 Cargo.lock                             |  1 +
 node/service/src/chain_spec/bifrost.rs | 44 +++++++++++++++-----------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fff8798855..ea1f645917 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -786,6 +786,7 @@ version = "0.8.0"
 dependencies = [
  "bifrost-flexible-fee",
  "bifrost-flexible-fee-rpc-runtime-api",
+ "bifrost-liquidity-mining",
  "bifrost-runtime-common",
  "bifrost-salp",
  "bifrost-salp-rpc-runtime-api",
diff --git a/node/service/src/chain_spec/bifrost.rs b/node/service/src/chain_spec/bifrost.rs
index 90a20f42b2..cf1b8d3faf 100644
--- a/node/service/src/chain_spec/bifrost.rs
+++ b/node/service/src/chain_spec/bifrost.rs
@@ -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};
@@ -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 {
@@ -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 },
@@ -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![(
@@ -135,8 +141,8 @@ fn development_config_genesis(id: ParaId) -> GenesisConfig {
 		vestings,
 		id,
 		tokens,
-		council,
-		technical_committee,
+		council_membership,
+		technical_committee_membership,
 	)
 }
 
@@ -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![
@@ -209,8 +215,8 @@ fn local_config_genesis(id: ParaId) -> GenesisConfig {
 		vestings,
 		id,
 		tokens,
-		council,
-		technical_committee,
+		council_membership,
+		technical_committee_membership,
 	)
 }
 
@@ -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
 	)
 }