feat: update parachain templates

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

@@ -15,7 +15,7 @@ use cliclack::{
 	outro, outro_cancel,
 };
 use pop_common::{
-	enum_variants,
+	enum_variants, enum_variants_for_help,
 	templates::{Template, Type},
 	Git, GitHub, Release,
 };
@@ -40,8 +40,9 @@ pub struct NewParachainCommand {
 	#[arg(
 		short = 't',
 		long,
-		help = "Template to use.",
-		value_parser = enum_variants!(Parachain)
+		help = format!("Template to use. [possible values: {}]", enum_variants_for_help!(Parachain)),
+		value_parser = enum_variants!(Parachain),
+		hide_possible_values = true // Hide the deprecated templates
 	)]
 	pub(crate) template: Option<Parachain>,
 	#[arg(
@@ -126,10 +127,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 +216,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!(
@@ -244,6 +244,9 @@ fn is_template_supported(provider: &Provider, template: &Parachain) -> Result<()
 			provider, template
 		)));
 	};
+	if template.is_deprecated() {
+		warning(format!("NOTE: this template is deprecated.{}", template.deprecated_message()))?;
+	}
 	Ok(())
 }
 
@@ -253,7 +256,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 +478,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-common/src/templates/mod.rs

@@ -45,6 +45,16 @@ pub trait Template:
 	fn template_type(&self) -> Result<&str, Error> {
 		self.get_str(Self::PROPERTY).ok_or(Error::TypeMissing)
 	}
+
+	/// Get whether the template is deprecated.
+	fn is_deprecated(&self) -> bool {
+		self.get_str("IsDeprecated").map_or(false, |s| s == "true")
+	}
+
+	/// Get the deprecation message for the template
+	fn deprecated_message(&self) -> &str {
+		self.get_str("DeprecatedMessage").unwrap_or_default()
+	}
 }
 
 /// A trait for defining overarching types of specific template variants.
@@ -76,7 +86,7 @@ pub trait Type<T: Template>: Clone + Default + EnumMessage + Eq + PartialEq + Va
 	fn templates(&self) -> Vec<&T> {
 		T::VARIANTS
 			.iter()
-			.filter(|t| t.get_str(T::PROPERTY) == Some(self.name()))
+			.filter(|t| t.get_str(T::PROPERTY) == Some(self.name()) && !t.is_deprecated())
 			.collect()
 	}
 
@@ -99,3 +109,15 @@ macro_rules! enum_variants {
 		.try_map(|s| <$e>::from_str(&s).map_err(|e| format!("could not convert from {s} to type")))
 	}};
 }
+
+#[macro_export]
+macro_rules! enum_variants_for_help {
+	($e:ty) => {{
+		<$e>::VARIANTS
+			.iter()
+			.filter(|variant| !variant.is_deprecated()) // Exclude deprecated variants for --help
+			.map(|v| v.as_ref())
+			.collect::<Vec<_>>()
+			.join(", ")
+	}};
+}

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" }