feat(contract-e2e): auto-source substrate-contracts-node with e2e tests

crates/pop-cli/src/commands/mod.rs

@@ -105,7 +105,7 @@ impl Command {
 			},
 			#[cfg(feature = "contract")]
 			Self::Test(args) => match args.command {
-				test::Command::Contract(cmd) => match cmd.execute() {
+				test::Command::Contract(cmd) => match cmd.execute().await {
 					Ok(feature) => Ok(json!(feature)),
 					Err(e) => Err(e),
 				},

crates/pop-cli/src/commands/test/contract.rs

@@ -1,17 +1,23 @@
 // SPDX-License-Identifier: GPL-3.0
 
-use crate::style::style;
+use crate::{common::contracts::check_contracts_node_and_prompt, style::style};
 use clap::Args;
-use cliclack::{clear_screen, intro, outro};
+use cliclack::{clear_screen, intro, log::warning, outro};
 use pop_contracts::{test_e2e_smart_contract, test_smart_contract};
 use std::path::PathBuf;
+#[cfg(not(test))]
+use {std::time::Duration, tokio::time::sleep};
 
 #[derive(Args)]
 pub(crate) struct TestContractCommand {
 	#[arg(short = 'p', long, help = "Path for the contract project [default: current directory]")]
 	path: Option<PathBuf>,
-	#[arg(short = 'f', long = "features", help = "Features for the contract project", value_parser=["e2e-tests"])]
+	/// [DEPRECATED] Run e2e tests
+	#[arg(short = 'f', long = "features", value_parser=["e2e-tests"])]
 	features: Option<String>,
+	/// Run end-to-end tests
+	#[arg(short = 'e', long = "e2e")]
+	e2e: bool,
 	#[arg(
 		short = 'n',
 		long = "node",
@@ -22,13 +28,36 @@ pub(crate) struct TestContractCommand {
 
 impl TestContractCommand {
 	/// Executes the command.
-	pub(crate) fn execute(self) -> anyhow::Result<&'static str> {
+	pub(crate) async fn execute(mut self) -> anyhow::Result<&'static str> {
 		clear_screen()?;
+
+		let mut show_deprecated = false;
 		if self.features.is_some() && self.features.clone().unwrap().contains("e2e-tests") {
+			show_deprecated = true;
+			self.e2e = true;
+			#[cfg(not(test))]
+			sleep(Duration::from_secs(3)).await;
+		}
+
+		if self.e2e {
 			intro(format!(
 				"{}: Starting end-to-end tests",
 				style(" Pop CLI ").black().on_magenta()
 			))?;
+
+			if show_deprecated {
+				warning("NOTE: --features e2e-tests is deprecated. Use --e2e instead.")?;
+			}
+
+			let maybe_node_path = check_contracts_node_and_prompt().await?;
+			if let Some(node_path) = maybe_node_path {
+				if node_path != PathBuf::new() {
+					self.node = Some(node_path);
+				}
+			} else {
+				warning("🚫 substrate-contracts-node is necessary to run e2e tests. Will try to run tests anyway...")?;
+			}
+
 			test_e2e_smart_contract(self.path.as_deref(), self.node.as_deref())?;
 			outro("End-to-end testing complete")?;
 			Ok("e2e")

crates/pop-cli/src/commands/up/contract.rs

@@ -2,6 +2,7 @@
 
 use crate::{
 	cli::{traits::Cli as _, Cli},
+	common::contracts::check_contracts_node_and_prompt,
 	style::style,
 };
 use clap::Args;
@@ -124,10 +125,28 @@ impl UpContractCommand {
 			// Update url to that of the launched node
 			self.url = Url::parse(DEFAULT_URL).expect("default url is valid");
 
+			let log = NamedTempFile::new()?;
+
+			// default to standalone binary, if it exists.
+			let mut binary_path = PathBuf::from("substrate-contracts-node");
+
+			// uses the cache location
+			let maybe_node_path = check_contracts_node_and_prompt().await?;
+			if let Some(node_path) = maybe_node_path {
+				if node_path != PathBuf::new() {
+					binary_path = node_path;
+				}
+			} else {
+				Cli.outro_cancel(
+					"🚫 You need to specify an accessible endpoint to deploy the contract.",
+				)?;
+				return Ok(());
+			}
+
 			let spinner = spinner();
 			spinner.start("Starting local node...");
-			let log = NamedTempFile::new()?;
-			let process = run_contracts_node(crate::cache()?, Some(log.as_file())).await?;
+
+			let process = run_contracts_node(binary_path, Some(log.as_file())).await?;
 			let bar = Style::new().magenta().dim().apply_to(Emoji("│", "|"));
 			spinner.stop(format!(
 				"Local node started successfully:{}",

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

@@ -8,7 +8,8 @@ use cliclack::{
 };
 use console::{Emoji, Style, Term};
 use duct::cmd;
-use pop_parachains::{Error, IndexSet, NetworkNode, Status, Zombienet};
+use pop_common::Status;
+use pop_parachains::{Error, IndexSet, NetworkNode, Zombienet};
 use std::{path::PathBuf, time::Duration};
 use tokio::time::sleep;
 

crates/pop-cli/src/common/contracts.rs

@@ -0,0 +1,41 @@
+use cliclack::{confirm, log::warning, spinner};
+use pop_contracts::{does_contracts_node_exist, download_contracts_node};
+use std::path::PathBuf;
+
+/// Helper function to check if the contracts node binary exists, and if not download it.
+/// returns:
+/// - Some("") if the standalone binary exists
+/// - Some(binary_cache_location) if the binary exists in pop's cache
+/// - None if the binary does not exist
+pub async fn check_contracts_node_and_prompt() -> anyhow::Result<Option<PathBuf>> {
+	let mut node_path = None;
+
+	// if the contracts node binary does not exist, prompt the user to download it
+	let maybe_contract_node_path = does_contracts_node_exist(crate::cache()?);
+	if maybe_contract_node_path == None {
+		warning("⚠️ The substrate-contracts-node binary is not found.")?;
+		if confirm("📦 Would you like to source it automatically now?")
+			.initial_value(true)
+			.interact()?
+		{
+			let spinner = spinner();
+			spinner.start("📦 Sourcing substrate-contracts-node...");
+
+			let cache_path = crate::cache()?;
+			let binary = download_contracts_node(cache_path.clone()).await?;
+
+			spinner.stop(format!(
+				"✅  substrate-contracts-node successfully sourced. Cached at: {}",
+				binary.path().to_str().unwrap()
+			));
+			node_path = Some(binary.path());
+		}
+	} else {
+		if let Some(contract_node_path) = maybe_contract_node_path {
+			// If the node_path is not empty (cached binary). Otherwise, the standalone binary will be used by cargo-contract.
+			node_path = Some(contract_node_path.0);
+		}
+	}
+
+	Ok(node_path)
+}

crates/pop-cli/src/common/mod.rs

@@ -0,0 +1,2 @@
+#[cfg(feature = "contract")]
+pub mod contracts;

crates/pop-cli/src/main.rs

@@ -17,6 +17,7 @@ use {
 mod cli;
 #[cfg(any(feature = "parachain", feature = "contract"))]
 mod commands;
+mod common;
 mod style;
 
 #[tokio::main]

crates/pop-cli/tests/contract.rs

@@ -4,10 +4,10 @@ use anyhow::Result;
 use assert_cmd::Command;
 use pop_common::templates::Template;
 use pop_contracts::{
-	dry_run_gas_estimate_instantiate, instantiate_smart_contract, run_contracts_node,
-	set_up_deployment, Contract, UpOpts,
+	download_contracts_node, dry_run_gas_estimate_instantiate, instantiate_smart_contract,
+	run_contracts_node, set_up_deployment, Contract, UpOpts,
 };
-use std::{path::Path, process::Command as Cmd};
+use std::{env::temp_dir, path::Path, process::Command as Cmd};
 use strum::VariantArray;
 use url::Url;
 
@@ -43,8 +43,9 @@ async fn contract_lifecycle() -> Result<()> {
 	assert!(temp_dir.join("test_contract/target/ink/test_contract.json").exists());
 
 	// Run the contracts node
-	let cache = temp_dir.join("cache");
-	let process = run_contracts_node(cache, None).await?;
+	let node_path = download_contracts_node(temp_dir.to_path_buf().clone()).await?;
+	let process = run_contracts_node(node_path.path(), None).await?;
+
 	// Only upload the contract
 	// pop up contract --upload-only
 	Command::cargo_bin("pop")

crates/pop-common/Cargo.toml

@@ -10,17 +10,22 @@ repository.workspace = true
 [dependencies]
 anyhow.workspace = true
 cargo_toml.workspace = true
+duct.workspace = true
+flate2.workspace = true
 git2.workspace = true
 git2_credentials.workspace = true
 regex.workspace = true
 reqwest.workspace = true
 serde_json.workspace = true
 serde.workspace = true
 strum.workspace = true
+tar.workspace = true
+tempfile.workspace = true
 thiserror.workspace = true
 tokio.workspace = true
 url.workspace = true
 
 [dev-dependencies]
 mockito.workspace = true
+strum_macros.workspace = true
 tempfile.workspace = true

crates/pop-common/src/errors.rs

@@ -1,10 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0
 
-use crate::templates;
+use crate::{sourcing, templates};
 use thiserror::Error;
 
 #[derive(Error, Debug)]
 pub enum Error {
+	#[error("Anyhow error: {0}")]
+	AnyhowError(#[from] anyhow::Error),
 	#[error("Configuration error: {0}")]
 	Config(String),
 	#[error("a git error occurred: {0}")]
@@ -17,6 +19,12 @@ pub enum Error {
 	ManifestError(#[from] cargo_toml::Error),
 	#[error("ParseError error: {0}")]
 	ParseError(#[from] url::ParseError),
+	#[error("SourceError error: {0}")]
+	SourceError(#[from] sourcing::Error),
 	#[error("TemplateError error: {0}")]
 	TemplateError(#[from] templates::Error),
+	#[error("Unsupported command: {0}")]
+	UnsupportedCommand(String),
+	#[error("Unsupported platform: {arch} {os}")]
+	UnsupportedPlatform { arch: &'static str, os: &'static str },
 }