bootstrap, chainspec: Make network-id modular (#651)

Signed-off-by: Shreevatsa N <vatsa@dhiway.com>

Author: vatsa287

node/cli/src/chain_spec/bootstrap.rs

@@ -57,6 +57,7 @@ pub struct ChainParams {
 	pub council_members: Vec<String>,
 	pub tech_committee_members: Vec<String>,
 	pub sudo_key: String,
+	pub network_id: i32,
 }
 
 impl ChainParams {
@@ -159,6 +160,7 @@ fn cord_braid_custom_config_genesis(config: ChainParams) -> serde_json::Value {
 		initial_well_known_nodes,
 		initial_authorities,
 		initial_sudo_key,
+		config.network_id,
 	)
 }
 
@@ -189,7 +191,7 @@ fn cord_loom_custom_config_genesis(config: ChainParams) -> serde_json::Value {
 
 	let initial_sudo_key: AccountId = array_bytes::hex_n_into_unchecked(&config.authorities[0][0]);
 
-	cord_loom_custom_genesis(initial_authorities, initial_sudo_key)
+	cord_loom_custom_genesis(initial_authorities, initial_sudo_key, config.network_id)
 }
 
 fn cord_weave_custom_config_genesis(config: ChainParams) -> serde_json::Value {
@@ -219,7 +221,7 @@ fn cord_weave_custom_config_genesis(config: ChainParams) -> serde_json::Value {
 
 	let initial_sudo_key: AccountId = array_bytes::hex_n_into_unchecked(&config.authorities[0][0]);
 
-	cord_weave_custom_genesis(initial_authorities, initial_sudo_key)
+	cord_weave_custom_genesis(initial_authorities, initial_sudo_key, config.network_id)
 }
 
 pub fn cord_custom_config(config: ChainParams) -> Result<CordChainSpec, String> {
@@ -299,12 +301,14 @@ fn cord_braid_custom_genesis(
 		BeefyId,
 	)>,
 	root_key: AccountId,
+	network_id: i32,
 ) -> serde_json::Value {
 	serde_json::json!( {
 		"balances": {
 			"balances": initial_authorities.iter().map(|k| (k.0.clone(), ENDOWMENT)).collect::<Vec<_>>(),
 		},
-		"doken": { "networkId": 2003},
+		/* TODO: Make the protocolId modular as well, to support origin chains */
+		"doken": { "protocolId": "c0rd".to_string(), "networkId": network_id },
 		"nodeAuthorization":  {
 			"nodes": initial_well_known_nodes.iter().map(|x| (x.0.clone(), x.1.clone())).collect::<Vec<_>>(),
 		},
@@ -353,12 +357,14 @@ fn cord_loom_custom_genesis(
 		BeefyId,
 	)>,
 	root_key: AccountId,
+	network_id: i32,
 ) -> serde_json::Value {
 	serde_json::json!( {
 		"balances": {
 			"balances": initial_authorities.iter().map(|k| (k.0.clone(), ENDOWMENT)).collect::<Vec<_>>(),
 		},
-		"doken": { "networkId": 2002},
+		/* TODO: Make the protocolId modular as well, to support origin chains */
+		"doken": { "protocolId": "c0rd".to_string(), "networkId": network_id },
 		"authorityMembership":  {
 			"initialAuthorities": initial_authorities
 				.iter()
@@ -413,12 +419,14 @@ fn cord_weave_custom_genesis(
 		BeefyId,
 	)>,
 	root_key: AccountId,
+	network_id: i32,
 ) -> serde_json::Value {
 	serde_json::json!( {
 		"balances": {
 			"balances": initial_authorities.iter().map(|k| (k.0.clone(), ENDOWMENT)).collect::<Vec<_>>(),
 		},
-		"doken": { "networkId": 2001},
+		/* TODO: Make the protocolId modular as well, to support origin chains */
+		"doken": { "protocolId": "c0rd".to_string(), "networkId": network_id },
 		"session":  {
 			"keys": initial_authorities
 				.iter()

node/cli/src/command/chain_setup.rs

@@ -40,6 +40,7 @@ pub struct ChainConfigParams {
 	pub council_members: Option<Vec<String>>,
 	pub tech_committee_members: Option<Vec<String>>,
 	pub sudo_key: Option<String>,
+	pub network_id: i32,
 }
 
 #[derive(Debug, Args)]
@@ -140,6 +141,12 @@ impl BootstrapChainCmd {
 				.expect("No authorities provided; cannot set sudo_key")
 		});
 
+		/* TODO: Make ProtocolId modular so we can support for Origin based custom chain
+		 * deployments. Currently we have the default protocol_id as 'c0rd' which is standalone
+		 * mode & it requires the network-id to be in range of [100, 1999)
+		 */
+		let network_id: i32 = config.network_id;
+
 		let chain_params = ChainParams {
 			chain_name,
 			chain_type,
@@ -150,6 +157,7 @@ impl BootstrapChainCmd {
 			council_members: initial_council_members,
 			tech_committee_members: initial_tech_committee_members,
 			sudo_key: initial_sudo_key,
+			network_id,
 		};
 
 		let chain_spec = match cord_custom_config(chain_params) {

scripts/bootstrap.sh

@@ -11,6 +11,7 @@ function usage() {
   echo "  -s, --SECRET          Secret key or seed for generating new accounts"
   echo "  -r, --runtime-type    Choose one of chain runtimes from braid, loom and weave. Default is loom."
   echo "  -o, --output-directory Directory where output files will be saved (default is current directory)"
+  echo "  -i, --network-id      Network ID of the bootstraped chain"
   echo ""
   echo "Description:"
   echo "  This script generates a configuration file for the CORD Custom Chain, including"
@@ -29,8 +30,9 @@ NUM_AUTHORITIES=3
 SECRET="0xf32255f569d8b1a12086dfd194653a5377fafcb67345753987741ec5542920ce"
 OUTPUT_DIR="."
 RUNTIME_TYPE="loom"
+NETWORK_ID=105
 
-while getopts "m:n:a:s:r:o:" flag; do
+while getopts "m:n:a:s:r:o:i:" flag; do
   case "${flag}" in
   m) NUM_MEMBERS=${OPTARG} ;;
   n) NUM_NODES=${OPTARG} ;;
@@ -45,6 +47,7 @@ while getopts "m:n:a:s:r:o:" flag; do
     fi
     ;;
   o) OUTPUT_DIR=${OPTARG} ;;
+  i) NETWORKD_ID=${OPTARG} ;;
   *)
     usage
     exit 1
@@ -67,6 +70,8 @@ echo "
 echo "chain_name = \"CORD Custom Chain\"" >>$CONFIG_FILE
 echo "chain_type = \"local\"" >>$CONFIG_FILE
 echo "runtime_type = \"${RUNTIME_TYPE}\"" >>$CONFIG_FILE
+echo "network_id = \"${NETWORK_ID}\"" >>$CONFIG_FILE
+
 echo "" >>$CONFIG_FILE
 
 # Initialize Accounts files