resolve conflicts for bifrost-polkadot runtime

node/service/res/bifrost-kusama.json

@@ -36,7 +36,6 @@
       "KAR",
       "ZLK",
       "KSM",
-      "DOT",
       "PHA"
     ]
   },

node/service/res/bifrost-polkadot.json

@@ -11,8 +11,13 @@
   ],
   "protocolId": "bifrost_polkadot",
   "properties": {
-    "tokenDecimals": 12,
-    "tokenSymbol": "BNC"
+    "ss58Format": 6,
+    "tokenDecimals": [
+      12
+    ],
+    "tokenSymbol": [
+      "BNC"
+    ]
   },
   "relay_chain": "polkadot",
   "para_id": 2001,

node/service/src/chain_spec/bifrost_kusama.rs

@@ -53,7 +53,7 @@ pub fn ENDOWMENT() -> u128 {
 	1_000_000 * dollar(CurrencyId::Native(TokenSymbol::BNC))
 }
 
-fn bifrost_properties() -> Properties {
+fn bifrost_kusama_properties() -> Properties {
 	let mut properties = sc_chain_spec::Properties::new();
 	let mut token_symbol: Vec<String> = vec![];
 	let mut token_decimals: Vec<u32> = vec![];
@@ -195,7 +195,7 @@ pub fn development_config(id: ParaId) -> Result<ChainSpec, String> {
 		vec![],
 		None,
 		Some(DEFAULT_PROTOCOL_ID),
-		Some(bifrost_properties()),
+		Some(bifrost_kusama_properties()),
 		RelayExtensions { relay_chain: "kusama-dev".into(), para_id: id.into() },
 	))
 }
@@ -275,7 +275,7 @@ pub fn local_testnet_config(id: ParaId) -> Result<ChainSpec, String> {
 		vec![],
 		None,
 		Some(DEFAULT_PROTOCOL_ID),
-		Some(bifrost_properties()),
+		Some(bifrost_kusama_properties()),
 		RelayExtensions { relay_chain: "kusama-local".into(), para_id: id.into() },
 	))
 }
@@ -289,7 +289,7 @@ pub fn chainspec_config(id: ParaId) -> ChainSpec {
 		vec![],
 		TelemetryEndpoints::new(vec![(TELEMETRY_URL.into(), 0)]).ok(),
 		Some(DEFAULT_PROTOCOL_ID),
-		Some(bifrost_properties()),
+		Some(bifrost_kusama_properties()),
 		RelayExtensions { relay_chain: "kusama".into(), para_id: id.into() },
 	)
 }

node/service/src/chain_spec/bifrost_polkadot.rs

@@ -19,11 +19,14 @@
 use bifrost_polkadot_runtime::{
 	constants::currency::DOLLARS, AccountId, AuraId, Balance, BalancesConfig, BlockNumber,
 	CollatorSelectionConfig, GenesisConfig, IndicesConfig, ParachainInfoConfig, PolkadotXcmConfig,
-	SessionConfig, SudoConfig, SystemConfig, VestingConfig, WASM_BINARY,
+	SS58Prefix, SessionConfig, SudoConfig, SystemConfig, VestingConfig, WASM_BINARY,
 };
+use bifrost_runtime_common::dollar;
 use cumulus_primitives_core::ParaId;
 use frame_benchmarking::{account, whitelisted_caller};
 use hex_literal::hex;
+use node_primitives::{CurrencyId, TokenInfo, TokenSymbol};
+use sc_chain_spec::Properties;
 use sc_service::ChainType;
 use sc_telemetry::TelemetryEndpoints;
 use sp_core::{crypto::UncheckedInto, sr25519};
@@ -37,7 +40,31 @@ const DEFAULT_PROTOCOL_ID: &str = "bifrost_polkadot";
 /// Specialized `ChainSpec` for the bifrost-polkadot runtime.
 pub type ChainSpec = sc_service::GenericChainSpec<GenesisConfig, RelayExtensions>;
 
-const ENDOWMENT: u128 = 1_000_000 * DOLLARS;
+#[allow(non_snake_case)]
+pub fn ENDOWMENT() -> u128 {
+	1_000_000 * dollar(CurrencyId::Native(TokenSymbol::BNC))
+}
+
+fn bifrost_polkadot_properties() -> Properties {
+	let mut properties = sc_chain_spec::Properties::new();
+	let mut token_symbol: Vec<String> = vec![];
+	let mut token_decimals: Vec<u32> = vec![];
+	[
+		// native token
+		CurrencyId::Native(TokenSymbol::BNC),
+	]
+	.iter()
+	.for_each(|token| {
+		token_symbol.push(token.symbol().to_string());
+		token_decimals.push(token.decimals() as u32);
+	});
+
+	properties.insert("tokenSymbol".into(), token_symbol.into());
+	properties.insert("tokenDecimals".into(), token_decimals.into());
+	properties.insert("ss58Format".into(), SS58Prefix::get().into());
+
+	properties
+}
 
 pub fn bifrost_polkadot_genesis(
 	invulnerables: Vec<(AccountId, AuraId)>,
@@ -87,11 +114,11 @@ fn development_config_genesis(id: ParaId) -> GenesisConfig {
 		get_account_id_from_seed::<sr25519::Public>("Alice"),
 		whitelisted_caller(), // Benchmarking whitelist_account
 	];
-	let balances = endowed_accounts.iter().cloned().map(|x| (x, ENDOWMENT)).collect();
+	let balances = endowed_accounts.iter().cloned().map(|x| (x, ENDOWMENT())).collect();
 	let vestings = endowed_accounts
 		.iter()
 		.cloned()
-		.map(|x| (x.clone(), 0u32, 100u32, ENDOWMENT / 4))
+		.map(|x| (x.clone(), 0u32, 100u32, ENDOWMENT() / 4))
 		.collect();
 
 	bifrost_polkadot_genesis(
@@ -115,7 +142,7 @@ pub fn development_config(id: ParaId) -> Result<ChainSpec, String> {
 		vec![],
 		None,
 		Some(DEFAULT_PROTOCOL_ID),
-		None,
+		Some(bifrost_polkadot_properties()),
 		RelayExtensions { relay_chain: "polkadot-dev".into(), para_id: id.into() },
 	))
 }
@@ -138,11 +165,11 @@ fn local_config_genesis(id: ParaId) -> GenesisConfig {
 		account("bechmarking_account_1", 0, 0), /* Benchmarking account_1, used for interacting
 		                       * with whitelistted_caller */
 	];
-	let balances = endowed_accounts.iter().cloned().map(|x| (x, ENDOWMENT)).collect();
+	let balances = endowed_accounts.iter().cloned().map(|x| (x, ENDOWMENT())).collect();
 	let vestings = endowed_accounts
 		.iter()
 		.cloned()
-		.map(|x| (x.clone(), 0u32, 100u32, ENDOWMENT / 4))
+		.map(|x| (x.clone(), 0u32, 100u32, ENDOWMENT() / 4))
 		.collect();
 
 	bifrost_polkadot_genesis(
@@ -169,16 +196,12 @@ pub fn local_testnet_config(id: ParaId) -> Result<ChainSpec, String> {
 		vec![],
 		None,
 		Some(DEFAULT_PROTOCOL_ID),
-		None,
+		Some(bifrost_polkadot_properties()),
 		RelayExtensions { relay_chain: "polkadot-local".into(), para_id: id.into() },
 	))
 }
 
 pub fn chainspec_config(id: ParaId) -> ChainSpec {
-	let mut properties = sc_chain_spec::Properties::new();
-	properties.insert("tokenSymbol".into(), "BNC".into());
-	properties.insert("tokenDecimals".into(), 12.into());
-
 	ChainSpec::from_genesis(
 		"Bifrost Polkadot",
 		"bifrost_polkadot",
@@ -187,7 +210,7 @@ pub fn chainspec_config(id: ParaId) -> ChainSpec {
 		vec![],
 		TelemetryEndpoints::new(vec![(TELEMETRY_URL.into(), 0)]).ok(),
 		Some(DEFAULT_PROTOCOL_ID),
-		Some(properties),
+		Some(bifrost_polkadot_properties()),
 		RelayExtensions { relay_chain: "polkadot".into(), para_id: id.into() },
 	)
 }