diff --git a/crates/pop-cli/Cargo.toml b/crates/pop-cli/Cargo.toml
index 4a6a63df..c9761b64 100644
--- a/crates/pop-cli/Cargo.toml
+++ b/crates/pop-cli/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "pop-cli"
description = "An all-in-one tool for Polkadot development."
-version = "0.3.0"
+version.workspace = true
edition.workspace = true
documentation.workspace = true
license.workspace = true
@@ -31,20 +31,20 @@ strum.workspace = true
strum_macros.workspace = true
# contracts
-pop-contracts = { path = "../pop-contracts", version = "0.3.0", optional = true }
+pop-contracts = { path = "../pop-contracts", version = "0.5.0", optional = true }
sp-core = { workspace = true, optional = true }
sp-weights = { workspace = true, optional = true }
# parachains
-pop-parachains = { path = "../pop-parachains", version = "0.3.0", optional = true }
+pop-parachains = { path = "../pop-parachains", version = "0.5.0", optional = true }
dirs = { workspace = true, optional = true }
git2.workspace = true
# telemetry
-pop-telemetry = { path = "../pop-telemetry", version = "0.3.0", optional = true }
+pop-telemetry = { path = "../pop-telemetry", version = "0.5.0", optional = true }
# common
-pop-common = { path = "../pop-common", version = "0.3.0" }
+pop-common = { path = "../pop-common", version = "0.5.0" }
[dev-dependencies]
assert_cmd.workspace = true
diff --git a/crates/pop-cli/src/commands/new/parachain.rs b/crates/pop-cli/src/commands/new/parachain.rs
index 830ee7ad..e65035cf 100644
--- a/crates/pop-cli/src/commands/new/parachain.rs
+++ b/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_without_deprecated,
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_without_deprecated!(Parachain)),
+ value_parser = enum_variants!(Parachain),
+ hide_possible_values = true // Hide the deprecated templates
)]
pub(crate) template: Option
,
#[arg(
@@ -216,7 +217,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 +245,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(())
}
diff --git a/crates/pop-cli/src/commands/up/contract.rs b/crates/pop-cli/src/commands/up/contract.rs
index 42166a69..9acbc2b6 100644
--- a/crates/pop-cli/src/commands/up/contract.rs
+++ b/crates/pop-cli/src/commands/up/contract.rs
@@ -223,11 +223,29 @@ impl UpContractCommand {
if !self.dry_run {
let spinner = spinner();
spinner.start("Uploading and instantiating the contract...");
- let contract_address =
- instantiate_smart_contract(instantiate_exec, weight_limit).await?;
+ let contract_info = instantiate_smart_contract(instantiate_exec, weight_limit).await?;
spinner.stop(format!(
- "Contract deployed and instantiated: The Contract Address is {:?}",
- contract_address
+ "Contract deployed and instantiated:\n{}",
+ style(format!(
+ "{}\n{}",
+ style(format!(
+ "{} The contract address is {:?}",
+ console::Emoji("●", ">"),
+ contract_info.address
+ ))
+ .dim(),
+ contract_info
+ .code_hash
+ .map(|hash| style(format!(
+ "{} The contract code hash is {:?}",
+ console::Emoji("●", ">"),
+ hash
+ ))
+ .dim()
+ .to_string())
+ .unwrap_or_default(),
+ ))
+ .dim()
));
Self::terminate_node(process)?;
Cli.outro(COMPLETE)?;
diff --git a/crates/pop-cli/tests/contract.rs b/crates/pop-cli/tests/contract.rs
index eec67e7d..3a51f122 100644
--- a/crates/pop-cli/tests/contract.rs
+++ b/crates/pop-cli/tests/contract.rs
@@ -86,7 +86,7 @@ async fn contract_lifecycle() -> Result<()> {
})
.await?;
let weight_limit = dry_run_gas_estimate_instantiate(&instantiate_exec).await?;
- let contract_address = instantiate_smart_contract(instantiate_exec, weight_limit).await?;
+ let contract_info = instantiate_smart_contract(instantiate_exec, weight_limit).await?;
// Call contract (only query)
// pop call contract --contract $INSTANTIATED_CONTRACT_ADDRESS --message get --suri //Alice
Command::cargo_bin("pop")
@@ -96,7 +96,7 @@ async fn contract_lifecycle() -> Result<()> {
"call",
"contract",
"--contract",
- &contract_address,
+ &contract_info.address,
"--message",
"get",
"--suri",
@@ -114,7 +114,7 @@ async fn contract_lifecycle() -> Result<()> {
"call",
"contract",
"--contract",
- &contract_address,
+ &contract_info.address,
"--message",
"flip",
"--suri",
diff --git a/crates/pop-common/Cargo.toml b/crates/pop-common/Cargo.toml
index 8a3afe61..108399db 100644
--- a/crates/pop-common/Cargo.toml
+++ b/crates/pop-common/Cargo.toml
@@ -1,8 +1,8 @@
[package]
name = "pop-common"
description = "Library that provides a collection of essential utilities and shared functionality for pop."
-version = "0.3.0"
readme = "README.md"
+version.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true
@@ -29,4 +29,4 @@ url.workspace = true
[dev-dependencies]
mockito.workspace = true
strum_macros.workspace = true
-tempfile.workspace = true
\ No newline at end of file
+tempfile.workspace = true
diff --git a/crates/pop-common/src/git.rs b/crates/pop-common/src/git.rs
index 8351058a..c64e092a 100644
--- a/crates/pop-common/src/git.rs
+++ b/crates/pop-common/src/git.rs
@@ -1,13 +1,12 @@
// SPDX-License-Identifier: GPL-3.0
-use crate::{errors::Error, APP_USER_AGENT};
+use crate::{errors::Error, polkadot_sdk::parse_latest_tag, APP_USER_AGENT};
use anyhow::Result;
use git2::{
build::RepoBuilder, FetchOptions, IndexAddOption, RemoteCallbacks, Repository as GitRepository,
ResetType,
};
use git2_credentials::CredentialHandler;
-use regex::Regex;
use std::{fs, path::Path};
use url::Url;
@@ -119,71 +118,7 @@ impl Git {
/// Fetch the latest release from a repository
fn fetch_latest_tag(repo: &GitRepository) -> Option {
let tags = repo.tag_names(None).ok()?;
- Self::parse_latest_tag(tags.iter().flatten().collect::>())
- }
-
- /// Parses a list of tags to identify the latest one, prioritizing tags in the stable format
- /// first.
- fn parse_latest_tag(tags: Vec<&str>) -> Option {
- match Self::parse_stable_format(tags.clone()) {
- Some(last_stable_tag) => Some(last_stable_tag),
- None => Self::parse_version_format(tags),
- }
- }
-
- /// Parse the stable release tags.
- fn parse_stable_format(tags: Vec<&str>) -> Option {
- // Regex for polkadot-stableYYMM and polkadot-stableYYMM-X
- let stable_reg = Regex::new(
- r"polkadot-stable(?P\d{2})(?P\d{2})(-(?P\d+))?(-rc\d+)?",
- )
- .expect("Valid regex");
- tags.into_iter()
- .filter_map(|tag| {
- // Skip the pre-release label
- if tag.contains("-rc") {
- return None;
- }
- stable_reg.captures(tag).and_then(|v| {
- let year = v.name("year")?.as_str().parse::().ok()?;
- let month = v.name("month")?.as_str().parse::().ok()?;
- let patch =
- v.name("patch").and_then(|m| m.as_str().parse::().ok()).unwrap_or(0);
- Some((tag, (year, month, patch)))
- })
- })
- .max_by(|a, b| {
- let (_, (year_a, month_a, patch_a)) = a;
- let (_, (year_b, month_b, patch_b)) = b;
- // Compare by year, then by month, then by patch number
- year_a
- .cmp(year_b)
- .then_with(|| month_a.cmp(month_b))
- .then_with(|| patch_a.cmp(patch_b))
- })
- .map(|(tag_str, _)| tag_str.to_string())
- }
-
- /// Parse the versioning release tags.
- fn parse_version_format(tags: Vec<&str>) -> Option {
- // Regex for polkadot-vmajor.minor.patch format
- let version_reg = Regex::new(r"v(?P\d+)\.(?P\d+)\.(?P\d+)(-rc\d+)?")
- .expect("Valid regex");
- tags.into_iter()
- .filter_map(|tag| {
- // Skip the pre-release label
- if tag.contains("-rc") {
- return None;
- }
- version_reg.captures(tag).and_then(|v| {
- let major = v.name("major")?.as_str().parse::().ok()?;
- let minor = v.name("minor")?.as_str().parse::().ok()?;
- let patch = v.name("patch")?.as_str().parse::().ok()?;
- Some((tag, (major, minor, patch)))
- })
- })
- .max_by_key(|&(_, version)| version)
- .map(|(tag_str, _)| tag_str.to_string())
+ parse_latest_tag(tags.iter().flatten().collect::>())
}
/// Init a new git repository.
@@ -544,57 +479,6 @@ mod tests {
);
}
- #[test]
- fn parse_latest_tag_works() {
- let mut tags = vec![];
- assert_eq!(Git::parse_latest_tag(tags), None);
- tags = vec![
- "polkadot-stable2407",
- "polkadot-stable2407-1",
- "polkadot-v1.10.0",
- "polkadot-v1.11.0",
- "polkadot-v1.12.0",
- "polkadot-v1.7.0",
- "polkadot-v1.8.0",
- "polkadot-v1.9.0",
- "v1.15.1-rc2",
- ];
- assert_eq!(Git::parse_latest_tag(tags), Some("polkadot-stable2407-1".to_string()));
- }
-
- #[test]
- fn parse_stable_format_works() {
- let mut tags = vec![];
- assert_eq!(Git::parse_stable_format(tags), None);
- tags = vec!["polkadot-stable2407", "polkadot-stable2408"];
- assert_eq!(Git::parse_stable_format(tags), Some("polkadot-stable2408".to_string()));
- tags = vec!["polkadot-stable2407", "polkadot-stable2501"];
- assert_eq!(Git::parse_stable_format(tags), Some("polkadot-stable2501".to_string()));
- // Skip the pre-release label
- tags = vec!["polkadot-stable2407", "polkadot-stable2407-1", "polkadot-stable2407-1-rc1"];
- assert_eq!(Git::parse_stable_format(tags), Some("polkadot-stable2407-1".to_string()));
- }
-
- #[test]
- fn parse_version_format_works() {
- let mut tags: Vec<&str> = vec![];
- assert_eq!(Git::parse_version_format(tags), None);
- tags = vec![
- "polkadot-v1.10.0",
- "polkadot-v1.11.0",
- "polkadot-v1.12.0",
- "polkadot-v1.7.0",
- "polkadot-v1.8.0",
- "polkadot-v1.9.0",
- ];
- assert_eq!(Git::parse_version_format(tags), Some("polkadot-v1.12.0".to_string()));
- tags = vec!["v1.0.0", "v2.0.0", "v3.0.0"];
- assert_eq!(Git::parse_version_format(tags), Some("v3.0.0".to_string()));
- // Skip the pre-release label
- tags = vec!["polkadot-v1.12.0", "v1.15.1-rc2"];
- assert_eq!(Git::parse_version_format(tags), Some("polkadot-v1.12.0".to_string()));
- }
-
mod repository {
use super::Error;
use crate::git::Repository;
diff --git a/crates/pop-common/src/lib.rs b/crates/pop-common/src/lib.rs
index 7206bc7e..bf2d6632 100644
--- a/crates/pop-common/src/lib.rs
+++ b/crates/pop-common/src/lib.rs
@@ -3,6 +3,7 @@ pub mod errors;
pub mod git;
pub mod helpers;
pub mod manifest;
+pub mod polkadot_sdk;
pub mod sourcing;
pub mod templates;
diff --git a/crates/pop-common/src/polkadot_sdk.rs b/crates/pop-common/src/polkadot_sdk.rs
new file mode 100644
index 00000000..9e538af7
--- /dev/null
+++ b/crates/pop-common/src/polkadot_sdk.rs
@@ -0,0 +1,128 @@
+// SPDX-License-Identifier: GPL-3.0
+
+//! Parses and identifies the latest version tags for Polkadot SDK releases.
+
+use regex::Regex;
+
+/// Identifies the latest tag from a list of tags, prioritizing tags in a stable format.
+///
+/// # Arguments
+/// * `tags` - A vector of tags to parse and evaluate.
+pub fn parse_latest_tag(tags: Vec<&str>) -> Option {
+ match parse_latest_stable(&tags) {
+ Some(last_stable_tag) => Some(last_stable_tag),
+ None => parse_version_format(&tags),
+ }
+}
+
+/// Retrieves the latest stable release ta
+fn parse_latest_stable(tags: &[&str]) -> Option {
+ // Regex for polkadot-stableYYMM and polkadot-stableYYMM-X
+ let stable_reg = Regex::new(
+ r"(polkadot-(parachain-)?)?stable(?P\d{2})(?P\d{2})(-(?P\d+))?(-rc\d+)?",
+ )
+ .expect("Valid regex");
+ tags.iter()
+ .filter_map(|tag| {
+ // Skip the pre-release label
+ if tag.contains("-rc") {
+ return None;
+ }
+ stable_reg.captures(tag).and_then(|v| {
+ let year = v.name("year")?.as_str().parse::().ok()?;
+ let month = v.name("month")?.as_str().parse::().ok()?;
+ let patch =
+ v.name("patch").and_then(|m| m.as_str().parse::().ok()).unwrap_or(0);
+ Some((tag, (year, month, patch)))
+ })
+ })
+ .max_by(|a, b| {
+ let (_, (year_a, month_a, patch_a)) = a;
+ let (_, (year_b, month_b, patch_b)) = b;
+ // Compare by year, then by month, then by patch number
+ year_a
+ .cmp(year_b)
+ .then_with(|| month_a.cmp(month_b))
+ .then_with(|| patch_a.cmp(patch_b))
+ })
+ .map(|(tag_str, _)| tag_str.to_string())
+}
+
+/// Parse the versioning release tags.
+fn parse_version_format(tags: &[&str]) -> Option {
+ // Regex for polkadot-vmajor.minor.patch format
+ let version_reg = Regex::new(r"v(?P\d+)\.(?P\d+)\.(?P\d+)(-rc\d+)?")
+ .expect("Valid regex");
+ tags.iter()
+ .filter_map(|tag| {
+ // Skip the pre-release label
+ if tag.contains("-rc") {
+ return None;
+ }
+ version_reg.captures(tag).and_then(|v| {
+ let major = v.name("major")?.as_str().parse::().ok()?;
+ let minor = v.name("minor")?.as_str().parse::().ok()?;
+ let patch = v.name("patch")?.as_str().parse::().ok()?;
+ Some((tag, (major, minor, patch)))
+ })
+ })
+ .max_by_key(|&(_, version)| version)
+ .map(|(tag_str, _)| tag_str.to_string())
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn parse_latest_tag_works() {
+ let mut tags = vec![];
+ assert_eq!(parse_latest_tag(tags), None);
+ tags = vec![
+ "polkadot-stable2409",
+ "polkadot-stable2409-1",
+ "polkadot-stable2407",
+ "polkadot-v1.10.0",
+ "polkadot-v1.11.0",
+ "polkadot-v1.12.0",
+ "polkadot-v1.7.0",
+ "polkadot-v1.8.0",
+ "polkadot-v1.9.0",
+ "v1.15.1-rc2",
+ ];
+ assert_eq!(parse_latest_tag(tags), Some("polkadot-stable2409-1".to_string()));
+ }
+
+ #[test]
+ fn parse_stable_format_works() {
+ let mut tags = vec![];
+ assert_eq!(parse_latest_stable(&tags), None);
+ tags = vec!["polkadot-stable2407", "polkadot-stable2408"];
+ assert_eq!(parse_latest_stable(&tags), Some("polkadot-stable2408".to_string()));
+ tags = vec!["polkadot-stable2407", "polkadot-stable2501"];
+ assert_eq!(parse_latest_stable(&tags), Some("polkadot-stable2501".to_string()));
+ // Skip the pre-release label
+ tags = vec!["polkadot-stable2407", "polkadot-stable2407-1", "polkadot-stable2407-1-rc1"];
+ assert_eq!(parse_latest_stable(&tags), Some("polkadot-stable2407-1".to_string()));
+ }
+
+ #[test]
+ fn parse_version_format_works() {
+ let mut tags: Vec<&str> = vec![];
+ assert_eq!(parse_version_format(&tags), None);
+ tags = vec![
+ "polkadot-v1.10.0",
+ "polkadot-v1.11.0",
+ "polkadot-v1.12.0",
+ "polkadot-v1.7.0",
+ "polkadot-v1.8.0",
+ "polkadot-v1.9.0",
+ ];
+ assert_eq!(parse_version_format(&tags), Some("polkadot-v1.12.0".to_string()));
+ tags = vec!["v1.0.0", "v2.0.0", "v3.0.0"];
+ assert_eq!(parse_version_format(&tags), Some("v3.0.0".to_string()));
+ // Skip the pre-release label
+ tags = vec!["polkadot-v1.12.0", "v1.15.1-rc2"];
+ assert_eq!(parse_version_format(&tags), Some("polkadot-v1.12.0".to_string()));
+ }
+}
diff --git a/crates/pop-common/src/sourcing/binary.rs b/crates/pop-common/src/sourcing/binary.rs
index 3efa5de4..e85df3eb 100644
--- a/crates/pop-common/src/sourcing/binary.rs
+++ b/crates/pop-common/src/sourcing/binary.rs
@@ -1,11 +1,11 @@
// SPDX-License-Identifier: GPL-3.0
use crate::{
+ polkadot_sdk::parse_latest_tag,
sourcing::{
from_local_package, Error,
GitHub::{ReleaseArchive, SourceCodeArchive},
- Source,
- Source::{Archive, Git, GitHub},
+ Source::{self, Archive, Git, GitHub},
},
Status,
};
@@ -112,10 +112,11 @@ impl Binary {
path.exists().then_some(Some(version.to_string()))
})
.nth(0)
- .unwrap_or(
+ .unwrap_or_else(|| {
// Default to latest version
- available.first().map(|version| version.as_ref().to_string()),
- ),
+ let versions = available.iter().map(|v| v.as_ref()).collect::>();
+ parse_latest_tag(versions)
+ }),
}
}
@@ -237,7 +238,7 @@ mod tests {
let name = "polkadot";
let temp_dir = tempdir()?;
- let available = vec!["v1.13.0", "v1.12.0", "v1.11.0"];
+ let available = vec!["v1.13.0", "v1.12.0", "v1.11.0", "stable2409"];
// Specified
let specified = Some("v1.12.0");
@@ -248,7 +249,7 @@ mod tests {
// Latest
assert_eq!(
Binary::resolve_version(name, None, &available, temp_dir.path()).unwrap(),
- available[0]
+ "stable2409"
);
// Cached
File::create(temp_dir.path().join(format!("{name}-{}", available[1])))?;
diff --git a/crates/pop-common/src/templates/extractor.rs b/crates/pop-common/src/templates/extractor.rs
index 486487d8..3c550571 100644
--- a/crates/pop-common/src/templates/extractor.rs
+++ b/crates/pop-common/src/templates/extractor.rs
@@ -12,7 +12,7 @@ use std::{fs, io, path::Path};
/// * `ignore_directories` - A vector of directory names to ignore during the extraction. If empty,
/// no directories are ignored.
pub fn extract_template_files(
- template_name: String,
+ template_name: &str,
repo_directory: &Path,
target_directory: &Path,
ignore_directories: Option>,
@@ -72,7 +72,7 @@ mod tests {
// Contract
let mut temp_dir = generate_testing_contract("erc20")?;
let mut output_dir = tempfile::tempdir()?;
- extract_template_files("erc20".to_string(), temp_dir.path(), output_dir.path(), None)?;
+ extract_template_files("erc20", temp_dir.path(), output_dir.path(), None)?;
assert!(output_dir.path().join("lib.rs").exists());
assert!(output_dir.path().join("Cargo.toml").exists());
assert!(output_dir.path().join("frontend").exists());
@@ -81,7 +81,7 @@ mod tests {
temp_dir = generate_testing_contract("erc721")?;
output_dir = tempfile::tempdir()?;
extract_template_files(
- "erc721".to_string(),
+ "erc721",
temp_dir.path(),
output_dir.path(),
Some(vec!["frontend".to_string()]),
diff --git a/crates/pop-common/src/templates/mod.rs b/crates/pop-common/src/templates/mod.rs
index e4f7604a..45edeebf 100644
--- a/crates/pop-common/src/templates/mod.rs
+++ b/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: 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_without_deprecated {
+ ($e:ty) => {{
+ <$e>::VARIANTS
+ .iter()
+ .filter(|variant| !variant.is_deprecated()) // Exclude deprecated variants for --help
+ .map(|v| v.as_ref())
+ .collect::>()
+ .join(", ")
+ }};
+}
diff --git a/crates/pop-contracts/Cargo.toml b/crates/pop-contracts/Cargo.toml
index 19bcbdf3..3d4f15fb 100644
--- a/crates/pop-contracts/Cargo.toml
+++ b/crates/pop-contracts/Cargo.toml
@@ -6,7 +6,7 @@ license = "Apache-2.0"
name = "pop-contracts"
readme = "README.md"
repository.workspace = true
-version = "0.3.0"
+version.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -36,7 +36,7 @@ contract-extrinsics.workspace = true
contract-transcode.workspace = true
scale-info.workspace = true
# pop
-pop-common = { path = "../pop-common", version = "0.3.0" }
+pop-common = { path = "../pop-common", version = "0.5.0" }
[dev-dependencies]
dirs.workspace = true
diff --git a/crates/pop-contracts/src/call.rs b/crates/pop-contracts/src/call.rs
index 7a964c38..e45a0a9c 100644
--- a/crates/pop-contracts/src/call.rs
+++ b/crates/pop-contracts/src/call.rs
@@ -330,11 +330,11 @@ mod tests {
})
.await?;
let weight = dry_run_gas_estimate_instantiate(&instantiate_exec).await?;
- let address = instantiate_smart_contract(instantiate_exec, weight).await?;
+ let contract_info = instantiate_smart_contract(instantiate_exec, weight).await?;
// Test querying a value.
let query_exec = set_up_call(CallOpts {
path: Some(temp_dir.path().join("testing")),
- contract: address.clone(),
+ contract: contract_info.address.clone(),
message: "get".to_string(),
args: [].to_vec(),
value: "0".to_string(),
@@ -350,7 +350,7 @@ mod tests {
// Test extrinsic execution by flipping the value.
let call_exec = set_up_call(CallOpts {
path: Some(temp_dir.path().join("testing")),
- contract: address,
+ contract: contract_info.address,
message: "flip".to_string(),
args: [].to_vec(),
value: "0".to_string(),
diff --git a/crates/pop-contracts/src/new.rs b/crates/pop-contracts/src/new.rs
index 256c226e..8e11fbd1 100644
--- a/crates/pop-contracts/src/new.rs
+++ b/crates/pop-contracts/src/new.rs
@@ -65,15 +65,10 @@ fn create_template_contract(
// Retrieve only the template contract files.
if template == &Contract::PSP22 || template == &Contract::PSP34 {
// Different template structure requires extracting different path
- extract_template_files(
- String::from(""),
- temp_dir.path(),
- canonicalized_path.as_path(),
- None,
- )?;
+ extract_template_files("", temp_dir.path(), canonicalized_path.as_path(), None)?;
} else {
extract_template_files(
- template.to_string(),
+ template.as_ref(),
temp_dir.path(),
canonicalized_path.as_path(),
Some(vec!["frontend".to_string()]),
@@ -95,10 +90,19 @@ pub fn rename_contract(name: &str, path: PathBuf, template: &Contract) -> Result
// Replace name in the lib.rs file.
file_path = path.join("lib.rs");
let name_in_camel_case = name.to_upper_camel_case();
- let mut replacements_in_contract = HashMap::new();
- replacements_in_contract.insert(template_name.as_str(), name);
- replacements_in_contract.insert(template.name(), &name_in_camel_case);
- replace_in_file(file_path, replacements_in_contract)?;
+ replace_in_file(
+ file_path,
+ HashMap::from([(template_name.as_str(), name), (template.name(), &name_in_camel_case)]),
+ )?;
+ // Replace name in the e2e_tests.rs file if exists.
+ let e2e_tests = path.join("e2e_tests.rs");
+ if e2e_tests.exists() {
+ let name_in_camel_case = format!("\"{}\"", name.to_upper_camel_case());
+ replace_in_file(
+ e2e_tests,
+ HashMap::from([(template_name.as_str(), name), (template.name(), &name_in_camel_case)]),
+ )?;
+ }
Ok(())
}
@@ -187,6 +191,20 @@ mod tests {
mod erc20
"#
)?;
+
+ let e2e_code = temp_dir.path().join("e2e_tests.rs");
+ let mut e2e_code_file = fs::File::create(e2e_code.clone())?;
+ writeln!(
+ e2e_code_file,
+ r#"
+ #[ink_e2e::test]
+ let contract = client
+ .instantiate("erc20", &ink_e2e::alice(), &mut constructor)
+ .submit()
+ .await
+ .expect("erc20 instantiate failed");
+ "#
+ )?;
Ok(temp_dir)
}
#[test]
@@ -200,6 +218,10 @@ mod tests {
let generated_code =
fs::read_to_string(temp_dir.path().join("lib.rs")).expect("Could not read file");
assert!(generated_code.contains("mod my_contract"));
+ let generated_e2e_code =
+ fs::read_to_string(temp_dir.path().join("e2e_tests.rs")).expect("Could not read file");
+ assert!(generated_e2e_code
+ .contains(".instantiate(\"my_contract\", &ink_e2e::alice(), &mut constructor)"));
Ok(())
}
diff --git a/crates/pop-contracts/src/node/mod.rs b/crates/pop-contracts/src/node/mod.rs
index c4e2978c..6618381b 100644
--- a/crates/pop-contracts/src/node/mod.rs
+++ b/crates/pop-contracts/src/node/mod.rs
@@ -120,7 +120,7 @@ pub async fn run_contracts_node(
output: Option<&File>,
) -> Result {
let mut command = Command::new(binary_path);
-
+ command.arg("-linfo,runtime::contracts=debug");
if let Some(output) = output {
command.stdout(Stdio::from(output.try_clone()?));
command.stderr(Stdio::from(output.try_clone()?));
diff --git a/crates/pop-contracts/src/templates.rs b/crates/pop-contracts/src/templates.rs
index a78c71d7..6c39d8c6 100644
--- a/crates/pop-contracts/src/templates.rs
+++ b/crates/pop-contracts/src/templates.rs
@@ -104,7 +104,7 @@ pub enum Contract {
serialize = "PSP34",
message = "Psp34",
detailed_message = "The implementation of the PSP34 standard in ink!",
- props(Type = "PSP", Repository = "https://github.com/Cardinal-Cryptography/PSP34")
+ props(Type = "PSP", Repository = "https://github.com/r0gue-io/PSP34")
)]
PSP34,
/// Domain name service example implemented in ink!
@@ -162,7 +162,7 @@ mod tests {
("erc721".to_string(), "https://github.com/use-ink/ink-examples"),
("erc1155".to_string(), "https://github.com/use-ink/ink-examples"),
("PSP22".to_string(), "https://github.com/Cardinal-Cryptography/PSP22"),
- ("PSP34".to_string(), "https://github.com/Cardinal-Cryptography/PSP34"),
+ ("PSP34".to_string(), "https://github.com/r0gue-io/PSP34"),
("dns".to_string(), "https://github.com/use-ink/ink-examples"),
("cross-contract-calls".to_string(), "https://github.com/use-ink/ink-examples"),
("multisig".to_string(), "https://github.com/use-ink/ink-examples"),
diff --git a/crates/pop-contracts/src/up.rs b/crates/pop-contracts/src/up.rs
index 2b304123..17b1bfa7 100644
--- a/crates/pop-contracts/src/up.rs
+++ b/crates/pop-contracts/src/up.rs
@@ -165,6 +165,14 @@ pub async fn dry_run_upload(
}
}
+/// Type to represent information about a deployed smart contract.
+pub struct ContractInfo {
+ /// The on-chain address of the deployed contract.
+ pub address: String,
+ /// The hash of the contract's code
+ pub code_hash: Option,
+}
+
/// Instantiate a contract.
///
/// # Arguments
@@ -174,12 +182,15 @@ pub async fn dry_run_upload(
pub async fn instantiate_smart_contract(
instantiate_exec: InstantiateExec,
gas_limit: Weight,
-) -> anyhow::Result {
+) -> anyhow::Result {
let instantiate_result = instantiate_exec
.instantiate(Some(gas_limit))
.await
.map_err(|error_variant| Error::InstantiateContractError(format!("{:?}", error_variant)))?;
- Ok(instantiate_result.contract_address.to_string())
+ // If is upload + instantiate, return the code hash.
+ let hash = instantiate_result.code_hash.map(|code_hash| format!("{:?}", code_hash));
+
+ Ok(ContractInfo { address: instantiate_result.contract_address.to_string(), code_hash: hash })
}
/// Upload a contract.
@@ -409,8 +420,9 @@ mod tests {
assert!(weight.ref_time() > 0);
assert!(weight.proof_size() > 0);
// Instantiate smart contract
- let address = instantiate_smart_contract(instantiate_exec, weight).await?;
- assert!(address.starts_with("5"));
+ let contract_info = instantiate_smart_contract(instantiate_exec, weight).await?;
+ assert!(contract_info.address.starts_with("5"));
+ assert!(contract_info.code_hash.is_none());
// Stop the process contracts-node
Command::new("kill")
.args(["-s", "TERM", &process.id().to_string()])
diff --git a/crates/pop-parachains/Cargo.toml b/crates/pop-parachains/Cargo.toml
index 1ac8166b..dd640682 100644
--- a/crates/pop-parachains/Cargo.toml
+++ b/crates/pop-parachains/Cargo.toml
@@ -1,12 +1,12 @@
[package]
name = "pop-parachains"
description = "Library for generating, building and running parachains."
-version = "0.3.0"
license = "Apache-2.0"
documentation = "https://docs.rs/pop-parachains/latest/pop_parachains"
edition.workspace = true
readme = "README.md"
repository.workspace = true
+version.workspace = true
[dependencies]
anyhow.workspace = true
@@ -31,10 +31,9 @@ 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" }
+pop-common = { path = "../pop-common", version = "0.5.0" }
[dev-dependencies]
mockito.workspace = true
diff --git a/crates/pop-parachains/src/build.rs b/crates/pop-parachains/src/build.rs
index 346bbaca..27a2acd9 100644
--- a/crates/pop-parachains/src/build.rs
+++ b/crates/pop-parachains/src/build.rs
@@ -381,7 +381,7 @@ mod tests {
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[parachains]]
id = 4385
diff --git a/crates/pop-parachains/src/new_parachain.rs b/crates/pop-parachains/src/new_parachain.rs
index 3ec763f4..8974cfed 100644
--- a/crates/pop-parachains/src/new_parachain.rs
+++ b/crates/pop-parachains/src/new_parachain.rs
@@ -8,7 +8,7 @@ use crate::{
use anyhow::Result;
use pop_common::{
git::Git,
- templates::{Template, Type},
+ templates::{extractor::extract_template_files, Template, Type},
};
use std::{fs, path::Path};
use walkdir::WalkDir;
@@ -32,6 +32,9 @@ pub fn instantiate_template_dir(
if Provider::Pop.provides(template) {
return instantiate_standard_template(template, target, config, tag_version);
}
+ if Provider::OpenZeppelin.provides(template) {
+ return instantiate_openzeppelin_template(template, target, tag_version);
+ }
let tag = Git::clone_and_degit(template.repository_url()?, target, tag_version)?;
Ok(tag)
}
@@ -75,6 +78,25 @@ pub fn instantiate_standard_template(
Ok(tag)
}
+pub fn instantiate_openzeppelin_template(
+ template: &Parachain,
+ target: &Path,
+ tag_version: Option,
+) -> Result> {
+ let temp_dir = ::tempfile::TempDir::new_in(std::env::temp_dir())?;
+ let source = temp_dir.path();
+
+ let tag = Git::clone_and_degit(template.repository_url()?, source, tag_version)?;
+ let mut template_name = template.template_name_without_provider();
+ // Handle deprecated OpenZeppelin template
+ if matches!(template, Parachain::DeprecatedOpenZeppelinGeneric) {
+ template_name = Parachain::OpenZeppelinGeneric.template_name_without_provider();
+ }
+
+ extract_template_files(template_name, temp_dir.path(), target, None)?;
+ Ok(tag)
+}
+
#[cfg(test)]
mod tests {
use super::*;
@@ -120,4 +142,22 @@ mod tests {
Ok(())
}
+
+ #[test]
+ fn test_parachain_instantiate_openzeppelin_template() -> Result<()> {
+ let temp_dir = tempfile::tempdir().expect("Failed to create temp dir");
+ instantiate_openzeppelin_template(&Parachain::OpenZeppelinEVM, temp_dir.path(), None)?;
+
+ let node_manifest =
+ pop_common::manifest::from_path(Some(&temp_dir.path().join("node/Cargo.toml")))
+ .expect("Failed to read file");
+ assert_eq!("evm-template-node", node_manifest.package().name());
+
+ let runtime_manifest =
+ pop_common::manifest::from_path(Some(&temp_dir.path().join("runtime/Cargo.toml")))
+ .expect("Failed to read file");
+ assert_eq!("evm-runtime-template", runtime_manifest.package().name());
+
+ Ok(())
+ }
}
diff --git a/crates/pop-parachains/src/templates.rs b/crates/pop-parachains/src/templates.rs
index c90234c8..0f9ba579 100644
--- a/crates/pop-parachains/src/templates.rs
+++ b/crates/pop-parachains/src/templates.rs
@@ -123,19 +123,34 @@ pub enum Parachain {
EVM,
// OpenZeppelin
#[strum(
- serialize = "polkadot-generic-runtime-template",
+ serialize = "openzeppelin/generic-template",
message = "Generic Runtime Template",
- detailed_message = "A generic template for Substrate Runtime",
+ detailed_message = "A generic template for Substrate Runtime.",
props(
Provider = "OpenZeppelin",
Repository = "https://github.com/OpenZeppelin/polkadot-runtime-templates",
Network = "./zombienet-config/devnet.toml",
- SupportedVersions = "v1.0.0",
+ SupportedVersions = "v1.0.0,v2.0.1,v2.0.3",
IsAudited = "true",
License = "GPL-3.0"
)
)]
OpenZeppelinGeneric,
+ // OpenZeppelin EVM
+ #[strum(
+ serialize = "openzeppelin/evm-template",
+ message = "EVM Template",
+ detailed_message = "Parachain with EVM compatibility out of the box.",
+ props(
+ Provider = "OpenZeppelin",
+ Repository = "https://github.com/OpenZeppelin/polkadot-runtime-templates",
+ Network = "./zombienet-config/devnet.toml",
+ SupportedVersions = "v2.0.3",
+ IsAudited = "true",
+ License = "GPL-3.0"
+ )
+ )]
+ OpenZeppelinEVM,
/// Minimal Substrate node configured for smart contracts via pallet-contracts.
#[strum(
serialize = "cpt",
@@ -162,7 +177,23 @@ pub enum Parachain {
)
)]
ParityFPT,
-
+ // OpenZeppelin
+ #[strum(
+ serialize = "polkadot-generic-runtime-template",
+ message = "Generic Runtime Template",
+ detailed_message = "A generic template for Substrate Runtime.",
+ props(
+ Provider = "OpenZeppelin",
+ Repository = "https://github.com/OpenZeppelin/polkadot-runtime-templates",
+ Network = "./zombienet-config/devnet.toml",
+ SupportedVersions = "v1.0.0,v2.0.1",
+ IsAudited = "true",
+ License = "GPL-3.0",
+ IsDeprecated = "true",
+ DeprecatedMessage = "This template is deprecated. Please use openzeppelin/generic-template in the future.",
+ )
+ )]
+ DeprecatedOpenZeppelinGeneric,
// templates for unit tests below
#[cfg(test)]
#[strum(
@@ -175,7 +206,9 @@ pub enum Parachain {
Network = "",
SupportedVersions = "v1.0.0,v2.0.0",
IsAudited = "true",
- License = "Unlicense"
+ IsDeprecated = "true",
+ DeprecatedMessage = "This template is deprecated. Please use test_02 in the future.",
+ License = "Unlicense",
)
)]
TestTemplate01,
@@ -216,6 +249,12 @@ impl Parachain {
pub fn license(&self) -> Option<&str> {
self.get_str("License")
}
+
+ /// Gets the template name, removing the provider if present.
+ pub fn template_name_without_provider(&self) -> &str {
+ let name = self.as_ref();
+ name.split_once('/').map_or(name, |(_, template)| template)
+ }
}
#[cfg(test)]
@@ -232,7 +271,9 @@ mod tests {
("contracts".to_string(), Contracts),
("evm".to_string(), EVM),
// openzeppelin
- ("polkadot-generic-runtime-template".to_string(), OpenZeppelinGeneric),
+ ("openzeppelin/generic-template".to_string(), OpenZeppelinGeneric),
+ ("openzeppelin/evm-template".to_string(), OpenZeppelinEVM),
+ ("polkadot-generic-runtime-template".to_string(), DeprecatedOpenZeppelinGeneric),
("cpt".to_string(), ParityContracts),
("fpt".to_string(), ParityFPT),
("test_01".to_string(), TestTemplate01),
@@ -240,6 +281,22 @@ mod tests {
])
}
+ fn templates_names_without_providers() -> HashMap {
+ HashMap::from([
+ (Standard, "standard".to_string()),
+ (Assets, "assets".to_string()),
+ (Contracts, "contracts".to_string()),
+ (EVM, "evm".to_string()),
+ (OpenZeppelinGeneric, "generic-template".to_string()),
+ (OpenZeppelinEVM, "evm-template".to_string()),
+ (DeprecatedOpenZeppelinGeneric, "polkadot-generic-runtime-template".to_string()),
+ (ParityContracts, "cpt".to_string()),
+ (ParityFPT, "fpt".to_string()),
+ (TestTemplate01, "test_01".to_string()),
+ (TestTemplate02, "test_02".to_string()),
+ ])
+ }
+
fn templates_urls() -> HashMap {
HashMap::from([
("standard".to_string(), "https://github.com/r0gue-io/base-parachain"),
@@ -247,6 +304,14 @@ mod tests {
("contracts".to_string(), "https://github.com/r0gue-io/contracts-parachain"),
("evm".to_string(), "https://github.com/r0gue-io/evm-parachain"),
// openzeppelin
+ (
+ "openzeppelin/generic-template".to_string(),
+ "https://github.com/OpenZeppelin/polkadot-runtime-templates",
+ ),
+ (
+ "openzeppelin/evm-template".to_string(),
+ "https://github.com/OpenZeppelin/polkadot-runtime-templates",
+ ),
(
"polkadot-generic-runtime-template".to_string(),
"https://github.com/OpenZeppelin/polkadot-runtime-templates",
@@ -265,6 +330,8 @@ mod tests {
(Contracts, Some("./network.toml")),
(EVM, Some("./network.toml")),
(OpenZeppelinGeneric, Some("./zombienet-config/devnet.toml")),
+ (OpenZeppelinEVM, Some("./zombienet-config/devnet.toml")),
+ (DeprecatedOpenZeppelinGeneric, Some("./zombienet-config/devnet.toml")),
(ParityContracts, Some("./zombienet.toml")),
(ParityFPT, Some("./zombienet-config.toml")),
(TestTemplate01, Some("")),
@@ -280,6 +347,8 @@ mod tests {
(Contracts, Some("Unlicense")),
(EVM, Some("Unlicense")),
(OpenZeppelinGeneric, Some("GPL-3.0")),
+ (OpenZeppelinEVM, Some("GPL-3.0")),
+ (DeprecatedOpenZeppelinGeneric, Some("GPL-3.0")),
(ParityContracts, Some("Unlicense")),
(ParityFPT, Some("Unlicense")),
(TestTemplate01, Some("Unlicense")),
@@ -331,6 +400,7 @@ mod tests {
fn test_network_config() {
let network_configs = template_network_configs();
for template in Parachain::VARIANTS {
+ println!("{:?}", template.name());
assert_eq!(template.network_config(), network_configs[template]);
}
}
@@ -399,4 +469,36 @@ mod tests {
let template = TestTemplate02;
assert_eq!(template.is_audited(), false);
}
+
+ #[test]
+ fn is_deprecated_works() {
+ let template = TestTemplate01;
+ assert_eq!(template.is_deprecated(), true);
+
+ let template = TestTemplate02;
+ assert_eq!(template.is_deprecated(), false);
+ }
+
+ #[test]
+ fn deprecated_message_works() {
+ let template = TestTemplate01;
+ assert_eq!(
+ template.deprecated_message(),
+ "This template is deprecated. Please use test_02 in the future."
+ );
+
+ let template = TestTemplate02;
+ assert_eq!(template.deprecated_message(), "");
+ }
+
+ #[test]
+ fn template_name_without_provider() {
+ let template_names = templates_names_without_providers();
+ for template in Parachain::VARIANTS {
+ assert_eq!(
+ template.template_name_without_provider(),
+ template_names.get(template).unwrap()
+ );
+ }
+ }
}
diff --git a/crates/pop-parachains/src/up/chain_specs.rs b/crates/pop-parachains/src/up/chain_specs.rs
index 051bbe1d..3513a587 100644
--- a/crates/pop-parachains/src/up/chain_specs.rs
+++ b/crates/pop-parachains/src/up/chain_specs.rs
@@ -30,7 +30,7 @@ pub(super) enum Runtime {
Repository = "https://github.com/r0gue-io/paseo-runtimes",
Binary = "chain-spec-generator",
Chain = "paseo-local",
- Fallback = "v1.2.4"
+ Fallback = "v1.2.6"
))]
Paseo,
/// Polkadot.
diff --git a/crates/pop-parachains/src/up/mod.rs b/crates/pop-parachains/src/up/mod.rs
index 80716606..036ae889 100644
--- a/crates/pop-parachains/src/up/mod.rs
+++ b/crates/pop-parachains/src/up/mod.rs
@@ -16,8 +16,7 @@ use std::{
use symlink::{remove_symlink_file, symlink_file};
use tempfile::{Builder, NamedTempFile};
use toml_edit::{value, ArrayOfTables, DocumentMut, Formatted, Item, Table, Value};
-use zombienet_sdk::{Network, NetworkConfig, NetworkConfigExt};
-use zombienet_support::fs::local::LocalFileSystem;
+use zombienet_sdk::{LocalFileSystem, Network, NetworkConfig, NetworkConfigExt};
mod chain_specs;
mod parachains;
@@ -445,6 +444,11 @@ impl NetworkConfiguration {
let command = format!("{} {}", Self::resolve_path(&path)?, "{{chainName}}");
*table.entry("chain_spec_command").or_insert(value(&command)) = value(&command);
}
+ // Check if EVM based parachain and insert evm_based for zombienet-sdk
+ let force_decorator = table.get("force_decorator").and_then(|i| i.as_str());
+ if force_decorator.is_some() && force_decorator.unwrap() == "generic-evm" {
+ table.insert("evm_based", value(true));
+ }
// Resolve individual collator command to binary
if let Some(collators) =
@@ -676,7 +680,7 @@ mod tests {
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
"#
)?;
let version = "v1.12.0";
@@ -756,7 +760,7 @@ chain = "paseo-local"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
default_command = "./bin-v1.6.0/polkadot"
"#
)?;
@@ -795,7 +799,7 @@ default_command = "./bin-v1.6.0/polkadot"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[relaychain.nodes]]
name = "alice"
@@ -838,7 +842,7 @@ command = "polkadot"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[relaychain.nodes]]
name = "alice"
@@ -869,7 +873,7 @@ command = "polkadot-v1.12.0"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
default_command = "polkadot"
[[relaychain.nodes]]
@@ -896,11 +900,11 @@ command = "polkadot-v1.12.0"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[parachains]]
id = 1000
-chain = "asset-hub-rococo-local"
+chain = "asset-hub-paseo-local"
"#
)?;
let system_parachain_version = "v1.12.0";
@@ -988,7 +992,7 @@ chain = "asset-hub-paseo-local"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[parachains]]
id = 4385
@@ -1030,7 +1034,7 @@ default_command = "pop-node"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[parachains]]
id = 4385
@@ -1072,7 +1076,7 @@ default_command = "pop-node"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[parachains]]
id = 2000
@@ -1109,7 +1113,7 @@ default_command = "./target/release/parachain-template-node"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[parachains]]
id = 2000
@@ -1149,7 +1153,7 @@ command = "./target/release/parachain-template-node"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[parachains]]
id = 2000
@@ -1191,7 +1195,7 @@ default_command = "moonbeam"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[parachains]]
"#
@@ -1214,7 +1218,7 @@ chain = "rococo-local"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[parachains]]
id = 404
@@ -1239,11 +1243,11 @@ default_command = "missing-binary"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[parachains]]
id = 1000
-chain = "asset-hub-rococo-local"
+chain = "asset-hub-paseo-local"
[[parachains]]
id = 2000
@@ -1265,7 +1269,7 @@ default_command = "pop-node"
None,
)
.await?;
- assert_eq!(zombienet.binaries().count(), 4);
+ assert_eq!(zombienet.binaries().count(), 6);
Ok(())
}
@@ -1309,7 +1313,7 @@ chain = "asset-hub-paseo-local"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
"#
)?;
@@ -1340,7 +1344,7 @@ chain = "rococo-local"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
"#
)?;
File::create(cache.join("polkadot"))?;
@@ -1377,7 +1381,7 @@ chain = "rococo-local"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
"#
)?;
let version = "v1.12.0";
@@ -1413,7 +1417,7 @@ chain = "rococo-local"
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[relaychain.nodes]]
name = "alice"
@@ -1476,7 +1480,7 @@ validator = true
config.as_file(),
r#"
[relaychain]
- chain = "rococo-local"
+ chain = "paseo-local"
default_command = "polkadot"
[[relaychain.nodes]]
name = "alice"
@@ -1484,7 +1488,7 @@ validator = true
)?;
let network_config = NetworkConfiguration::from(config.path())?;
let relay_chain = network_config.relay_chain()?;
- assert_eq!("rococo-local", relay_chain["chain"].as_str().unwrap());
+ assert_eq!("paseo-local", relay_chain["chain"].as_str().unwrap());
assert_eq!(
"polkadot",
NetworkConfiguration::default_command(relay_chain).unwrap().as_str().unwrap()
@@ -1502,7 +1506,7 @@ validator = true
config.as_file(),
r#"
[relaychain]
- chain = "rococo-local"
+ chain = "paseo-local"
[[parachains]]
id = 2000
default_command = "node"
@@ -1526,7 +1530,7 @@ validator = true
config.as_file(),
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[relaychain.nodes]]
name = "alice"
@@ -1534,7 +1538,7 @@ command = "polkadot"
[[parachains]]
id = 1000
-chain = "asset-hub-rococo-local"
+chain = "asset-hub-paseo-local"
[[parachains.collators]]
name = "asset-hub"
@@ -1581,7 +1585,7 @@ command = "./target/release/parachain-template-node"
manifest: None,
},
workers: ["polkadot-execute-worker", ""],
- chain: "rococo-local".to_string(),
+ chain: "paseo-local".to_string(),
chain_spec_generator: None,
},
&[
@@ -1637,7 +1641,7 @@ command = "./target/release/parachain-template-node"
format!(
r#"
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
default_command = "{0}"
[[relaychain.nodes]]
@@ -1646,7 +1650,7 @@ command = "{0}"
[[parachains]]
id = 1000
-chain = "asset-hub-rococo-local"
+chain = "asset-hub-paseo-local"
default_command = "{1}"
[[parachains.collators]]
diff --git a/crates/pop-parachains/src/up/parachains.rs b/crates/pop-parachains/src/up/parachains.rs
index abd60a4f..06eda16e 100644
--- a/crates/pop-parachains/src/up/parachains.rs
+++ b/crates/pop-parachains/src/up/parachains.rs
@@ -2,6 +2,7 @@
use super::{chain_specs::chain_spec_generator, Binary};
use pop_common::{
+ polkadot_sdk::parse_latest_tag,
sourcing::{
traits::{Source as _, *},
GitHub::ReleaseArchive,
@@ -28,8 +29,8 @@ pub(super) enum Parachain {
#[strum(props(
Repository = "https://github.com/r0gue-io/pop-node",
Binary = "pop-node",
- Prerelease = "true",
- Fallback = "v0.1.0-alpha2"
+ Prerelease = "false",
+ Fallback = "testnet-v0.4.1"
))]
Pop,
}
@@ -90,7 +91,10 @@ pub(super) async fn system(
None => {
// Default to same version as relay chain when not explicitly specified
// Only set latest when caller has not explicitly specified a version to use
- (Some(relay_chain_version.to_string()), para.releases().await?.into_iter().next())
+ (
+ Some(relay_chain_version.to_string()),
+ parse_latest_tag(para.releases().await?.iter().map(|s| s.as_str()).collect()),
+ )
},
};
let source = TryInto::try_into(para, tag, latest)?;
@@ -156,7 +160,7 @@ mod tests {
None,
None,
"v1.12.0",
- Some("asset-hub-rococo-local"),
+ Some("asset-hub-paseo-local"),
tempdir()?.path()
)
.await?
diff --git a/crates/pop-parachains/src/up/relay.rs b/crates/pop-parachains/src/up/relay.rs
index 8e1e94db..662e639f 100644
--- a/crates/pop-parachains/src/up/relay.rs
+++ b/crates/pop-parachains/src/up/relay.rs
@@ -3,6 +3,7 @@
use super::chain_specs::chain_spec_generator;
pub use pop_common::{
git::GitHub,
+ polkadot_sdk::parse_latest_tag,
sourcing::{
traits::{Source as _, *},
Binary,
@@ -104,13 +105,16 @@ pub(super) async fn from(
let releases = relay.releases().await?;
let tag = Binary::resolve_version(name, version, &releases, cache);
// Only set latest when caller has not explicitly specified a version to use
- let latest = version.is_none().then(|| releases.first().map(|v| v.to_string())).flatten();
+ let latest = version
+ .is_none()
+ .then(|| parse_latest_tag(releases.iter().map(|s| s.as_str()).collect()))
+ .flatten();
let binary = Binary::Source {
name: name.to_string(),
source: TryInto::try_into(&relay, tag, latest)?,
cache: cache.to_path_buf(),
};
- let chain = chain.unwrap_or("rococo-local");
+ let chain = chain.unwrap_or("paseo-local");
return Ok(super::RelayChain {
binary,
workers: relay.workers(),
diff --git a/crates/pop-parachains/templates/base/chain_spec.templ b/crates/pop-parachains/templates/base/chain_spec.templ
index 7049ee55..b4d6df39 100644
--- a/crates/pop-parachains/templates/base/chain_spec.templ
+++ b/crates/pop-parachains/templates/base/chain_spec.templ
@@ -72,7 +72,7 @@ pub fn development_config() -> ChainSpec {
ChainSpec::builder(
runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
Extensions {
- relay_chain: "rococo-local".into(),
+ relay_chain: "paseo-local".into(),
// You MUST set this to the correct network!
para_id: 2000,
},
@@ -123,7 +123,7 @@ pub fn local_testnet_config() -> ChainSpec {
ChainSpec::builder(
runtime::WASM_BINARY.expect("WASM binary was not built, please build it!"),
Extensions {
- relay_chain: "rococo-local".into(),
+ relay_chain: "paseo-local".into(),
// You MUST set this to the correct network!
para_id: 2000,
},
diff --git a/crates/pop-parachains/templates/base/network.templ b/crates/pop-parachains/templates/base/network.templ
index 02a01cac..f66860d3 100644
--- a/crates/pop-parachains/templates/base/network.templ
+++ b/crates/pop-parachains/templates/base/network.templ
@@ -1,5 +1,5 @@
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[relaychain.nodes]]
name = "alice"
diff --git a/crates/pop-parachains/tests/parachain.rs b/crates/pop-parachains/tests/parachain.rs
index 751912e1..1b03c294 100644
--- a/crates/pop-parachains/tests/parachain.rs
+++ b/crates/pop-parachains/tests/parachain.rs
@@ -102,37 +102,13 @@ async fn launch_polkadot_and_system_parachain() -> Result<()> {
}
#[tokio::test]
-async fn launch_rococo() -> Result<()> {
+async fn launch_paseo_and_system_parachain() -> Result<()> {
let temp_dir = tempfile::tempdir()?;
let cache = temp_dir.path().to_path_buf();
let mut zombienet = Zombienet::new(
&cache,
- "../../tests/networks/rococo.toml",
- Some(BINARY_VERSION),
- None,
- None,
- None,
- None,
- )
- .await?;
-
- for binary in zombienet.binaries().filter(|b| !b.exists()) {
- binary.source(true, &(), true).await?;
- }
-
- zombienet.spawn().await?;
- Ok(())
-}
-
-#[tokio::test]
-async fn launch_rococo_and_system_parachain() -> Result<()> {
- let temp_dir = tempfile::tempdir()?;
- let cache = temp_dir.path().to_path_buf();
-
- let mut zombienet = Zombienet::new(
- &cache,
- "../../tests/networks/rococo+coretime.toml",
+ "../../tests/networks/paseo+coretime.toml",
Some(BINARY_VERSION),
None,
Some(BINARY_VERSION),
@@ -150,7 +126,7 @@ async fn launch_rococo_and_system_parachain() -> Result<()> {
}
#[tokio::test]
-async fn launch_rococo_and_two_parachains() -> Result<()> {
+async fn launch_paseo_and_two_parachains() -> Result<()> {
let temp_dir = tempfile::tempdir()?;
let cache = temp_dir.path().to_path_buf();
diff --git a/crates/pop-telemetry/Cargo.toml b/crates/pop-telemetry/Cargo.toml
index e9a0ce97..9db87516 100644
--- a/crates/pop-telemetry/Cargo.toml
+++ b/crates/pop-telemetry/Cargo.toml
@@ -1,11 +1,11 @@
[package]
name = "pop-telemetry"
description = "Library for collecting anonymous Usage Metrics Collection with Umami."
-version = "0.3.0"
readme = "README.md"
edition.workspace = true
license.workspace = true
repository.workspace = true
+version.workspace = true
[dependencies]
dirs = { workspace = true }
diff --git a/tests/networks/rococo+coretime.toml b/tests/networks/paseo+coretime.toml
similarity index 62%
rename from tests/networks/rococo+coretime.toml
rename to tests/networks/paseo+coretime.toml
index ffa9c65e..f7cbf5f5 100644
--- a/tests/networks/rococo+coretime.toml
+++ b/tests/networks/paseo+coretime.toml
@@ -1,7 +1,7 @@
-# pop up parachain -f ./tests/networks/rococo+coretime.toml
+# pop up parachain -f ./tests/networks/paseo+coretime.toml
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[relaychain.nodes]]
name = "alice"
@@ -13,7 +13,7 @@ validator = true
[[parachains]]
id = 1005
-chain = "coretime-rococo-local"
+chain = "coretime-paseo-local"
[[parachains.collators]]
name = "coretime-01"
\ No newline at end of file
diff --git a/tests/networks/pop.toml b/tests/networks/pop.toml
index 8dd1b563..9ad7c871 100644
--- a/tests/networks/pop.toml
+++ b/tests/networks/pop.toml
@@ -1,7 +1,7 @@
# pop up parachain -f ./tests/networks/pop.toml
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[relaychain.nodes]]
name = "alice"
@@ -13,7 +13,7 @@ validator = true
[[parachains]]
id = 1000
-chain = "asset-hub-rococo-local"
+chain = "asset-hub-paseo-local"
[[parachains.collators]]
name = "asset-hub"
diff --git a/tests/networks/rococo.toml b/tests/networks/rococo.toml
deleted file mode 100644
index 040190a1..00000000
--- a/tests/networks/rococo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-# pop up parachain -f ./tests/networks/rococo.toml
-
-[relaychain]
-chain = "rococo-local"
-
-[[relaychain.nodes]]
-name = "alice"
-validator = true
-
-[[relaychain.nodes]]
-name = "bob"
-validator = true
\ No newline at end of file
diff --git a/tests/networks/template.toml b/tests/networks/template.toml
index bfced0c4..87d1f0c8 100644
--- a/tests/networks/template.toml
+++ b/tests/networks/template.toml
@@ -1,7 +1,7 @@
# pop up parachain -f ./tests/networks/template.toml
[relaychain]
-chain = "rococo-local"
+chain = "paseo-local"
[[relaychain.nodes]]
name = "alice"
+