feat: add new parachain template and remove outdated one from parity

Cargo.toml

@@ -60,8 +60,7 @@ toml_edit = { version = "0.22", features = ["serde"] }
 symlink = "0.1"
 serde_json = { version = "1.0", features = ["preserve_order"] }
 serde = { version = "1.0", features = ["derive"] }
-zombienet-sdk = "0.2.7"
-zombienet-support = "0.2.7"
+zombienet-sdk = "0.2.10"
 git2_credentials = "0.13.0"
 
 # pop-cli

crates/pop-cli/src/commands/new/parachain.rs

@@ -126,10 +126,9 @@ async fn guide_user_to_generate_parachain(verify: bool) -> Result<NewParachainCo
 			provider,
 			provider.name(),
 			format!(
-				"{} {} available option(s) {}",
+				"{} {} available option(s)",
 				provider.description(),
-				provider.templates().len(),
-				if provider.name() == "Parity" { "[deprecated]" } else { "" }
+				provider.templates().len()
 			),
 		);
 	}
@@ -216,7 +215,7 @@ async fn generate_parachain_from_template(
 	// add next steps
 	let mut next_steps = vec![
 		format!("cd into \"{name_template}\" and enjoy hacking! 🚀"),
-		"Use `pop build` to build your parachain.".into(),
+		"Use `pop build --release` to build your parachain.".into(),
 	];
 	if let Some(network_config) = template.network_config() {
 		next_steps.push(format!(
@@ -253,7 +252,15 @@ fn display_select_options(provider: &Provider) -> Result<&Parachain> {
 		if i == 0 {
 			prompt = prompt.initial_value(template);
 		}
-		prompt = prompt.item(template, template.name(), template.description());
+		prompt = prompt.item(
+			template,
+			template.name(),
+			format!(
+				"{} {}",
+				template.description(),
+				if matches!(template, Parachain::ParityContracts) { "[deprecated]" } else { "" }
+			),
+		);
 	}
 	Ok(prompt.interact()?)
 }
@@ -467,11 +474,11 @@ mod tests {
 	fn test_is_template_supported() -> Result<()> {
 		is_template_supported(&Provider::Pop, &Parachain::Standard)?;
 		assert!(is_template_supported(&Provider::Pop, &Parachain::ParityContracts).is_err());
-		assert!(is_template_supported(&Provider::Pop, &Parachain::ParityFPT).is_err());
+		assert!(is_template_supported(&Provider::Pop, &Parachain::ParityGeneric).is_err());
 
 		assert!(is_template_supported(&Provider::Parity, &Parachain::Standard).is_err());
 		is_template_supported(&Provider::Parity, &Parachain::ParityContracts)?;
-		is_template_supported(&Provider::Parity, &Parachain::ParityFPT)
+		is_template_supported(&Provider::Parity, &Parachain::ParityGeneric)
 	}
 
 	#[test]

crates/pop-parachains/Cargo.toml

@@ -31,7 +31,6 @@ toml_edit.workspace = true
 walkdir.workspace = true
 # Zombienet
 zombienet-sdk.workspace = true
-zombienet-support.workspace = true
 
 # Pop
 pop-common = { path = "../pop-common", version = "0.3.0" }

crates/pop-parachains/src/templates.rs

@@ -38,7 +38,7 @@ impl Type<Parachain> for Provider {
 		match &self {
 			Provider::Pop => Some(Parachain::Standard),
 			Provider::OpenZeppelin => Some(Parachain::OpenZeppelinGeneric),
-			Provider::Parity => Some(Parachain::ParityContracts),
+			Provider::Parity => Some(Parachain::ParityGeneric),
 		}
 	}
 }
@@ -136,33 +136,32 @@ pub enum Parachain {
 		)
 	)]
 	OpenZeppelinGeneric,
-	/// Minimal Substrate node configured for smart contracts via pallet-contracts.
+	/// The Parachain-Ready Template From Polkadot SDK.
 	#[strum(
-		serialize = "cpt",
-		message = "Contracts",
-		detailed_message = "Minimal Substrate node configured for smart contracts via pallet-contracts.",
+		serialize = "polkadot-sdk-parachain-template",
+		message = "Polkadot SDK's Parachain Template",
+		detailed_message = "The Parachain-Ready Template From Polkadot SDK.",
 		props(
 			Provider = "Parity",
-			Repository = "https://github.com/paritytech/substrate-contracts-node",
+			Repository = "https://github.com/paritytech/polkadot-sdk-parachain-template",
 			Network = "./zombienet.toml",
 			License = "Unlicense"
 		)
 	)]
-	ParityContracts,
-	/// Template node for a Frontier (EVM) based parachain.
+	ParityGeneric,
+	/// Minimal Substrate node configured for smart contracts via pallet-contracts.
 	#[strum(
-		serialize = "fpt",
-		message = "EVM",
-		detailed_message = "Template node for a Frontier (EVM) based parachain.",
+		serialize = "cpt",
+		message = "Contracts",
+		detailed_message = "Minimal Substrate node configured for smart contracts via pallet-contracts.",
 		props(
 			Provider = "Parity",
-			Repository = "https://github.com/paritytech/frontier-parachain-template",
-			Network = "./zombienet-config.toml",
+			Repository = "https://github.com/paritytech/substrate-contracts-node",
+			Network = "./zombienet.toml",
 			License = "Unlicense"
 		)
 	)]
-	ParityFPT,
-
+	ParityContracts,
 	// templates for unit tests below
 	#[cfg(test)]
 	#[strum(
@@ -233,8 +232,8 @@ mod tests {
 			("evm".to_string(), EVM),
 			// openzeppelin
 			("polkadot-generic-runtime-template".to_string(), OpenZeppelinGeneric),
+			("polkadot-sdk-parachain-template".to_string(), ParityGeneric),
 			("cpt".to_string(), ParityContracts),
-			("fpt".to_string(), ParityFPT),
 			("test_01".to_string(), TestTemplate01),
 			("test_02".to_string(), TestTemplate02),
 		])
@@ -251,8 +250,11 @@ mod tests {
 				"polkadot-generic-runtime-template".to_string(),
 				"https://github.com/OpenZeppelin/polkadot-runtime-templates",
 			),
+			(
+				"polkadot-sdk-parachain-template".to_string(),
+				"https://github.com/paritytech/polkadot-sdk-parachain-template",
+			),
 			("cpt".to_string(), "https://github.com/paritytech/substrate-contracts-node"),
-			("fpt".to_string(), "https://github.com/paritytech/frontier-parachain-template"),
 			("test_01".to_string(), ""),
 			("test_02".to_string(), ""),
 		])
@@ -265,8 +267,8 @@ mod tests {
 			(Contracts, Some("./network.toml")),
 			(EVM, Some("./network.toml")),
 			(OpenZeppelinGeneric, Some("./zombienet-config/devnet.toml")),
+			(ParityGeneric, Some("./zombienet.toml")),
 			(ParityContracts, Some("./zombienet.toml")),
-			(ParityFPT, Some("./zombienet-config.toml")),
 			(TestTemplate01, Some("")),
 			(TestTemplate02, Some("")),
 		]
@@ -280,8 +282,8 @@ mod tests {
 			(Contracts, Some("Unlicense")),
 			(EVM, Some("Unlicense")),
 			(OpenZeppelinGeneric, Some("GPL-3.0")),
+			(ParityGeneric, Some("Unlicense")),
 			(ParityContracts, Some("Unlicense")),
-			(ParityFPT, Some("Unlicense")),
 			(TestTemplate01, Some("Unlicense")),
 			(TestTemplate02, Some("GPL-3.0")),
 		]
@@ -295,7 +297,7 @@ mod tests {
 				assert_eq!(Provider::Pop.provides(&template), true);
 				assert_eq!(Provider::Parity.provides(&template), false);
 			}
-			if matches!(template, ParityContracts | ParityFPT) {
+			if matches!(template, ParityContracts | ParityGeneric) {
 				assert_eq!(Provider::Pop.provides(&template), false);
 				assert_eq!(Provider::Parity.provides(&template), true)
 			}
@@ -348,15 +350,15 @@ mod tests {
 		let mut provider = Provider::Pop;
 		assert_eq!(provider.default_template(), Some(Standard));
 		provider = Provider::Parity;
-		assert_eq!(provider.default_template(), Some(ParityContracts));
+		assert_eq!(provider.default_template(), Some(ParityGeneric));
 	}
 
 	#[test]
 	fn test_templates_of_provider() {
 		let mut provider = Provider::Pop;
 		assert_eq!(provider.templates(), [&Standard, &Assets, &Contracts, &EVM]);
 		provider = Provider::Parity;
-		assert_eq!(provider.templates(), [&ParityContracts, &ParityFPT]);
+		assert_eq!(provider.templates(), [&ParityGeneric, &ParityContracts]);
 	}
 
 	#[test]