feat: add eth-rpc binary to pop up contract (#705)

Author: moliholy

Cargo.lock

@@ -79,7 +79,6 @@ cumulus-client-cli = { version = "0.26.0", default-features = false }
 # benchmarking
 cumulus-primitives-proof-size-hostfunction = "0.15.0"
 frame-benchmarking-cli = { version = "51.0.0", default-features = false }
-frame-storage-access-test-runtime = { version = "0.4.0", default-features = false }
 sc-chain-spec = { version = "46.0.0", default-features = false }
 sp-runtime = { version = "44.0.0", default-features = false }
 sp-statement-store = "23.0.0"

Cargo.toml

@@ -895,7 +895,7 @@ mod tests {
 
 	mod zombienet {
 		use super::*;
-		use pop_common::Status;
+		use pop_common::{Status, helpers::with_current_dir_async};
 
 		pub(crate) struct Output;
 		impl Status for Output {
@@ -1478,48 +1478,52 @@ name = "collator"
 command = "substrate-contracts-node"
 "#
 			)?;
-			// Expecting failure since no custom path is provided and binaries don't exist in the
-			// default build directory.
-			assert!(matches!(
-				Zombienet::new(&cache, config.path().try_into()?, None, None, None, None, None).await,
-				Err(Error::MissingBinary(command))
-				if command == "parachain-template-node"
-			));
-			// Create the binaries in the default build directory.
-			let parachain_template = PathBuf::from("target/release/parachain-template-node");
-			create_dir_all(parachain_template.parent().unwrap())?;
-			File::create(&parachain_template)?;
-			// Ensure the the binary is detected in the debug profile too.
-			let parachain_contracts_template =
-				PathBuf::from("target/debug/substrate-contracts-node");
-			create_dir_all(parachain_contracts_template.parent().unwrap())?;
-			File::create(&parachain_contracts_template)?;
-
-			let zombienet =
-				Zombienet::new(&cache, config.path().try_into()?, None, None, None, None, None)
-					.await?;
-			// Remove the binaries created above after Zombienet initialization, as they are no
-			// longer needed.
-			remove_file(&parachain_template)?;
-			remove_file(&parachain_contracts_template)?;
-			remove_dir(parachain_template.parent().unwrap())?;
-			remove_dir(parachain_contracts_template.parent().unwrap())?;
-
-			assert_eq!(zombienet.parachains.len(), 2);
-			let parachain = &zombienet.parachains.get(&1000).unwrap().binary;
-			assert_eq!(parachain.name(), "parachain-template-node");
-			assert_eq!(parachain.path(), Path::new("./target/release/parachain-template-node"));
-			assert_eq!(parachain.version(), None);
-			assert!(matches!(parachain, Binary::Local { .. }));
-			let contract_parachain = &zombienet.parachains.get(&2000).unwrap().binary;
-			assert_eq!(contract_parachain.name(), "substrate-contracts-node");
-			assert_eq!(
-				contract_parachain.path(),
-				Path::new("./target/debug/substrate-contracts-node")
-			);
-			assert_eq!(contract_parachain.version(), None);
-			assert!(matches!(contract_parachain, Binary::Local { .. }));
-			Ok(())
+			let temp_workspace = tempdir()?;
+			with_current_dir_async(temp_workspace.path(), async || {
+				// Expecting failure since no custom path is provided and binaries don't exist in
+				// the default build directory.
+				assert!(matches!(
+					Zombienet::new(&cache, config.path().try_into()?, None, None, None, None, None).await,
+					Err(Error::MissingBinary(command))
+					if command == "parachain-template-node"
+				));
+				// Create the binaries in the default build directory.
+				let parachain_template = PathBuf::from("target/release/parachain-template-node");
+				create_dir_all(parachain_template.parent().unwrap())?;
+				File::create(&parachain_template)?;
+				// Ensure the the binary is detected in the debug profile too.
+				let parachain_contracts_template =
+					PathBuf::from("target/debug/substrate-contracts-node");
+				create_dir_all(parachain_contracts_template.parent().unwrap())?;
+				File::create(&parachain_contracts_template)?;
+
+				let zombienet =
+					Zombienet::new(&cache, config.path().try_into()?, None, None, None, None, None)
+						.await?;
+				// Remove the binaries created above after Zombienet initialization, as they are no
+				// longer needed.
+				remove_file(&parachain_template)?;
+				remove_file(&parachain_contracts_template)?;
+				remove_dir(parachain_template.parent().unwrap())?;
+				remove_dir(parachain_contracts_template.parent().unwrap())?;
+
+				assert_eq!(zombienet.parachains.len(), 2);
+				let parachain = &zombienet.parachains.get(&1000).unwrap().binary;
+				assert_eq!(parachain.name(), "parachain-template-node");
+				assert_eq!(parachain.path(), Path::new("./target/release/parachain-template-node"));
+				assert_eq!(parachain.version(), None);
+				assert!(matches!(parachain, Binary::Local { .. }));
+				let contract_parachain = &zombienet.parachains.get(&2000).unwrap().binary;
+				assert_eq!(contract_parachain.name(), "substrate-contracts-node");
+				assert_eq!(
+					contract_parachain.path(),
+					Path::new("./target/debug/substrate-contracts-node")
+				);
+				assert_eq!(contract_parachain.version(), None);
+				assert!(matches!(contract_parachain, Binary::Local { .. }));
+				Ok(())
+			})
+			.await
 		}
 
 		#[tokio::test]

crates/pop-chains/src/up/mod.rs

@@ -1320,12 +1320,11 @@ mod tests {
 		cli::MockCli,
 		common::{
 			bench::source_omni_bencher_binary,
-			helpers::with_current_dir,
 			runtime::{Feature::Benchmark, get_mock_runtime},
 		},
 	};
 	use anyhow::Ok;
-	use pop_common::Profile;
+	use pop_common::{Profile, helpers::with_current_dir};
 	use std::fs::{self, File};
 	use strum::EnumMessage;
 	use tempfile::tempdir;

crates/pop-cli/src/commands/bench/pallet.rs

@@ -71,7 +71,7 @@ impl Display for Command {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::common::helpers::with_current_dir;
+	use pop_common::helpers::with_current_dir;
 	use std::{env::set_current_dir, fs};
 	use tempfile::tempdir;
 

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

@@ -4,7 +4,7 @@ use crate::{
 	cli,
 	common::{
 		TestFeature::{self, *},
-		contracts::check_contracts_node_and_prompt,
+		contracts::check_ink_node_and_prompt,
 	},
 };
 use clap::Args;
@@ -44,22 +44,18 @@ impl TestContractCommand {
 		if self.e2e {
 			cli.intro("Starting end-to-end tests")?;
 			let spinner = spinner();
-			self.node = match check_contracts_node_and_prompt(
-				cli,
-				&spinner,
-				&crate::cache()?,
-				self.skip_confirm,
-			)
-			.await
-			{
-				Ok(binary_path) => Some(binary_path),
-				Err(_) => {
-					cli.warning(
-						"🚫 substrate-contracts-node is necessary to run e2e tests. Will try to run tests anyway...",
-					)?;
-					Some(PathBuf::new())
-				},
-			};
+			self.node =
+				match check_ink_node_and_prompt(cli, &spinner, &crate::cache()?, self.skip_confirm)
+					.await
+				{
+					Ok((binary_path, _)) => Some(binary_path),
+					Err(_) => {
+						cli.warning(
+							"🚫 ink-node is necessary to run e2e tests. Will try to run tests anyway...",
+						)?;
+						Some(PathBuf::new())
+					},
+				};
 
 			spinner.clear();
 			test_e2e_smart_contract(&self.path, self.node.as_deref(), self.test)?;

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

@@ -8,8 +8,8 @@ use crate::{
 	commands::call::contract::CallContractCommand,
 	common::{
 		contracts::{
-			check_contracts_node_and_prompt, has_contract_been_built, map_account,
-			normalize_call_args, request_contract_function_args, terminate_node,
+			check_ink_node_and_prompt, has_contract_been_built, map_account, normalize_call_args,
+			request_contract_function_args, terminate_nodes,
 		},
 		rpc::prompt_to_select_chain_rpc,
 		urls,
@@ -19,12 +19,12 @@ use crate::{
 };
 use clap::Args;
 use cliclack::{ProgressBar, spinner};
-use console::{Emoji, Style};
+use console::Emoji;
 use pop_contracts::{
 	Bytes, FunctionType, UpOpts, Verbosity, Weight, build_smart_contract,
 	dry_run_gas_estimate_instantiate, dry_run_upload, extract_function, get_contract_code,
 	get_instantiate_payload, get_upload_payload, instantiate_contract_signed,
-	instantiate_smart_contract, is_chain_alive, parse_hex_bytes, run_contracts_node,
+	instantiate_smart_contract, is_chain_alive, parse_hex_bytes, run_eth_rpc_node, run_ink_node,
 	set_up_deployment, set_up_upload, upload_contract_signed, upload_smart_contract,
 };
 use sp_core::bytes::to_hex;
@@ -34,6 +34,8 @@ use url::Url;
 
 const COMPLETE: &str = "🚀 Deployment complete";
 const DEFAULT_PORT: u16 = 9944;
+const DEFAULT_ETH_RPC_PORT: u16 = 8545;
+const DEFAULT_INK_NODE_URL: &str = "ws://127.0.0.1:9944";
 const FAILED: &str = "🚫 Deployment failed.";
 const HELP_HEADER: &str = "Smart contract deployment options";
 
@@ -127,7 +129,7 @@ impl UpContractCommand {
 		}
 
 		// Check if specified chain is accessible
-		let process = if !is_chain_alive(self.url.clone()).await? {
+		let processes = if !is_chain_alive(self.url.clone()).await? {
 			let local_url = Url::parse(urls::LOCAL).expect("default url is valid");
 			let start_local_node = if !self.skip_confirm {
 				let msg = if self.url.as_str() == urls::LOCAL {
@@ -166,11 +168,12 @@ impl UpContractCommand {
 				// Update url to that of the launched node
 				self.url = local_url;
 
-				let log = NamedTempFile::new()?;
+				let log_ink_node = NamedTempFile::new()?;
+				let log_eth_rpc = NamedTempFile::new()?;
 				let spinner = spinner();
 
 				// uses the cache location
-				let binary_path = match check_contracts_node_and_prompt(
+				let (ink_node_binary_path, eth_rpc_binary_path) = match check_ink_node_and_prompt(
 					&mut Cli,
 					&spinner,
 					&crate::cache()?,
@@ -189,25 +192,40 @@ impl UpContractCommand {
 
 				spinner.start("Starting local node...");
 
-				let process =
-					run_contracts_node(binary_path, Some(log.as_file()), DEFAULT_PORT).await?;
-				let bar = Style::new().magenta().dim().apply_to(Emoji("│", "|"));
-				spinner.stop(format!(
+				let ink_node_process =
+					run_ink_node(&ink_node_binary_path, Some(log_ink_node.as_file()), DEFAULT_PORT)
+						.await?;
+				let eth_rpc_node_process = run_eth_rpc_node(
+					&eth_rpc_binary_path,
+					Some(log_eth_rpc.as_file()),
+					DEFAULT_INK_NODE_URL,
+					DEFAULT_ETH_RPC_PORT,
+				)
+				.await?;
+				spinner.clear();
+				Cli.info(format!(
 					"Local node started successfully:{}",
 					style(format!(
-						"
-{bar}  {}
-{bar}  {}",
+						"\n{}\n{}",
 						style(format!(
 							"portal: https://polkadot.js.org/apps/?rpc={}#/explorer",
 							self.url
 						))
 						.dim(),
-						style(format!("logs: tail -f {}", log.path().display())).dim(),
+						style(format!("logs: tail -f {}", log_ink_node.path().display())).dim(),
+					))
+					.dim()
+				))?;
+				Cli.info(format!(
+					"Ethereum RPC node started successfully:{}",
+					style(format!(
+						"\n{}\n{}",
+						style(format!("url: ws://localhost:{}", DEFAULT_ETH_RPC_PORT)).dim(),
+						style(format!("logs: tail -f {}", log_eth_rpc.path().display())).dim(),
 					))
 					.dim()
-				));
-				Some((process, log))
+				))?;
+				Some(((ink_node_process, log_ink_node), (eth_rpc_node_process, log_eth_rpc)))
 			} else {
 				None
 			}
@@ -221,7 +239,7 @@ impl UpContractCommand {
 				Ok(data) => data,
 				Err(e) => {
 					Cli.error(format!("An error occurred getting the call data: {e}"))?;
-					terminate_node(&mut Cli, process).await?;
+					terminate_nodes(&mut Cli, processes).await?;
 					Cli.outro_cancel(FAILED)?;
 					return Ok(());
 				},
@@ -242,7 +260,7 @@ impl UpContractCommand {
 						Err(e) => {
 							spinner
 								.error(format!("An error occurred uploading your contract: {e}"));
-							terminate_node(&mut Cli, process).await?;
+							terminate_nodes(&mut Cli, processes).await?;
 							Cli.outro_cancel(FAILED)?;
 							return Ok(());
 						},
@@ -261,7 +279,7 @@ impl UpContractCommand {
 							Cli.error(format!(
 								"An error occurred instantiating the contract: {e}"
 							))?;
-							terminate_node(&mut Cli, process).await?;
+							terminate_nodes(&mut Cli, processes).await?;
 							Cli.outro_cancel(FAILED)?;
 							return Ok(());
 						},
@@ -279,7 +297,7 @@ impl UpContractCommand {
 						Err(e) => {
 							spinner
 								.error(format!("An error occurred uploading your contract: {e}"));
-							terminate_node(&mut Cli, process).await?;
+							terminate_nodes(&mut Cli, processes).await?;
 							Cli.outro_cancel(FAILED)?;
 							return Ok(());
 						},
@@ -299,19 +317,19 @@ impl UpContractCommand {
 				}
 			} else {
 				Cli.outro_cancel("Signed payload doesn't exist.")?;
-				terminate_node(&mut Cli, process).await?;
+				terminate_nodes(&mut Cli, processes).await?;
 				return Ok(());
 			}
 
 			Cli.outro(COMPLETE)?;
-			terminate_node(&mut Cli, process).await?;
+			terminate_nodes(&mut Cli, processes).await?;
 			return Ok(());
 		}
 
 		// Check for upload only.
 		if self.upload_only {
 			let result = self.upload_contract().await;
-			terminate_node(&mut Cli, process).await?;
+			terminate_nodes(&mut Cli, processes).await?;
 			match result {
 				Ok(_) => {
 					Cli.outro(COMPLETE)?;
@@ -334,7 +352,7 @@ impl UpContractCommand {
 			Ok(i) => i,
 			Err(e) => {
 				Cli.error(format!("An error occurred instantiating the contract: {e}"))?;
-				terminate_node(&mut Cli, process).await?;
+				terminate_nodes(&mut Cli, processes).await?;
 				Cli.outro_cancel(FAILED)?;
 				return Ok(());
 			},
@@ -354,7 +372,7 @@ impl UpContractCommand {
 				},
 				Err(e) => {
 					spinner.error(format!("{e}"));
-					terminate_node(&mut Cli, process).await?;
+					terminate_nodes(&mut Cli, processes).await?;
 					Cli.outro_cancel(FAILED)?;
 					return Ok(());
 				},
@@ -371,7 +389,7 @@ impl UpContractCommand {
 
 			Cli.success(COMPLETE)?;
 			self.keep_interacting_with_node(&mut Cli, contract_address).await?;
-			terminate_node(&mut Cli, process).await?;
+			terminate_nodes(&mut Cli, processes).await?;
 		}
 
 		Ok(())