chore: Change chain Id -- replace testnet2 with premainnet

Author: 0xbillw

crates/ces-types/src/lib.rs

@@ -157,7 +157,7 @@ pub enum ChainNetwork {
 	Dev,
 	Devnet,
 	Testnet,
-	Testnet2
+	Premainnet
 }
 
 impl Default for ChainNetwork {
@@ -171,7 +171,7 @@ impl FromStr for ChainNetwork {
 
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
 		match s {
-			"testnet2" => Ok(ChainNetwork::Testnet2),
+			"premainnet" => Ok(ChainNetwork::Premainnet),
 			"testnet" => Ok(ChainNetwork::Testnet),
 			"devnet" => Ok(ChainNetwork::Devnet),
 			"dev" => Ok(ChainNetwork::Dev),

scripts/docker/build.sh

@@ -21,7 +21,7 @@ Usage:
 
 Options:
     -b <program name>  which program image to build, default: node
-    -n <network profile>  options: devnet, testnet, testnet2, mainnet
+    -n <network profile>  options: devnet, testnet, premainnet, mainnet
     -s <image tag suffix>  padding a suffix for the image tag
     -t <image tag>  specific the tag name of the image, exclusion from option -s
     -x <proxy address>  use proxy access network in build
@@ -87,7 +87,7 @@ while getopts ":hpn:b:x:t:s:o:v:l:" opt; do
         else
             VC=0
         fi
-        ;;    
+        ;;
     l)
         docker_build_log=$OPTARG
         ;;
@@ -96,7 +96,7 @@ while getopts ":hpn:b:x:t:s:o:v:l:" opt; do
         ;;
     s)
         image_tag_suffix=$OPTARG
-        ;;    
+        ;;
     \?)
         echo "Invalid option: -$OPTARG" 1>&2
         exit 1
@@ -105,7 +105,7 @@ while getopts ":hpn:b:x:t:s:o:v:l:" opt; do
 done
 
 
-if ! [[ $network = "devnet" || $network = "testnet" || $network = "mainnet" || $network = "testnet2" ]]; then
+if ! [[ $network = "devnet" || $network = "testnet" || $network = "mainnet" || $network = "premainnet" ]]; then
     echo "Invalid network option, use 'devnet' instead"
     network="devnet"
 fi

scripts/launch-help/ces-launch.py

@@ -158,7 +158,7 @@ def main():
     p_gen = subparsers.add_parser("gen", help="Generate docker-compose.yml")
     p_gen.add_argument(
         "--chain",
-        choices=["testnet2", "testnet", "devnet"],
+        choices=["premainnet", "testnet", "devnet"],
         default="devnet",
         help="CESS chain-specification, default: devnet",
     )

standalone/chain/node/ccg/premainnet-spec-raw.json

@@ -351,8 +351,8 @@ pub fn testnet_chain_spec() -> ChainSpec {
 	ChainSpec::from_json_bytes(&include_bytes!("../ccg/testnet-spec-raw.json")[..]).unwrap()
 }
 
-pub fn testnet2_chain_spec() -> ChainSpec {
-	ChainSpec::from_json_bytes(&include_bytes!("../ccg/testnet2-spec-raw.json")[..]).unwrap()
+pub fn premainnet_chain_spec() -> ChainSpec {
+	ChainSpec::from_json_bytes(&include_bytes!("../ccg/premainnet-spec-raw.json")[..]).unwrap()
 }
 
 pub fn devnet_chain_spec() -> ChainSpec {
@@ -381,11 +381,11 @@ pub fn make_testnet_chain_spec() -> ChainSpec {
 		.build()
 }
 
-pub fn make_testnet2_chain_spec() -> ChainSpec {
+pub fn make_premainnet_chain_spec() -> ChainSpec {
 	ChainSpec::builder(wasm_binary_unwrap(), Default::default())
-		.with_name("cess-testnet2")
-		.with_id("cess-testnet2")
-		.with_protocol_id("cestn2")
+		.with_name("cess-premainnet")
+		.with_id("cess-premainnet")
+		.with_protocol_id("cespn1")
 		.with_chain_type(ChainType::Live)
 		.with_properties(properties())
 		.with_genesis_config_patch(testnet_genesis_config())

standalone/chain/node/ccg/testnet2-spec-raw.json

@@ -57,12 +57,12 @@ impl SubstrateCli for Cli {
 
 	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
 		let spec = match id {
-			"testnet2" | "cess-testnet2" | "" => Box::new(chain_spec::testnet2_chain_spec()),
+			"premainnet" | "cess-premainnet" | "" => Box::new(chain_spec::premainnet_chain_spec()),
 			"testnet" | "cess-testnet" => Box::new(chain_spec::testnet_chain_spec()),
 			"devnet" | "cess-devnet" => Box::new(chain_spec::devnet_chain_spec()),
 			"initial-devnet" | "cess-initial-devnet" => Box::new(chain_spec::make_devnet_chain_spec()),
 			"initial-testnet" | "cess-initial-testnet" => Box::new(chain_spec::make_testnet_chain_spec()),
-			"initial-testnet2" | "cess-initial-testnet2" => Box::new(chain_spec::make_testnet2_chain_spec()),
+			"initial-premainnet" | "cess-initial-premainnet" => Box::new(chain_spec::make_premainnet_chain_spec()),
 			"dev" => Box::new(chain_spec::make_dev_chain_spec()),
 			"local" => Box::new(chain_spec::make_local_testnet_chain_spec()),
 			path => Box::new(chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path))?),
@@ -164,7 +164,7 @@ pub fn run() -> sc_cli::Result<()> {
 			};
 			use frame_benchmarking_cli::{
 				BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFERENCE_HARDWARE,
-			};			
+			};
 
 			let runner = cli.create_runner(cmd)?;
 
@@ -205,7 +205,7 @@ pub fn run() -> sc_cli::Result<()> {
 					},
 					BenchmarkCmd::Overhead(cmd) => {
 						let (client, _, _, _, _) = service::new_chain_ops(&mut config)?;
-						let ext_builder = RemarkBuilder::new(client.clone());						
+						let ext_builder = RemarkBuilder::new(client.clone());
 						cmd.run(
 							config.chain_spec.name().into(),
 							client,
@@ -234,11 +234,11 @@ pub fn run() -> sc_cli::Result<()> {
 				}
 			})
 		},
-		
+
 		Some(Subcommand::FrontierDb(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
 			runner.sync_run(|mut config| {
-				let (client, _, _, _, frontier_backend) = service::new_chain_ops(&mut config)?;				
+				let (client, _, _, _, frontier_backend) = service::new_chain_ops(&mut config)?;
 				cmd.run(client, frontier_backend)
 			})
 		},