From 063b5986b67c140f59941a8cd7b03482b61c046e Mon Sep 17 00:00:00 2001 From: Frank Bell Date: Thu, 10 Oct 2024 15:24:06 +0100 Subject: [PATCH] chore: update zombienet-sdk --- Cargo.lock | 38 +++++++++++++++++------------ Cargo.toml | 3 +-- crates/pop-parachains/Cargo.toml | 6 ++--- crates/pop-parachains/src/up/mod.rs | 11 ++++----- 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8ecdab2d..6df864a7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4766,8 +4766,8 @@ dependencies = [ "serde_json", "strum 0.26.3", "strum_macros 0.26.4", - "subxt 0.37.0", - "subxt-signer 0.37.0", + "subxt", + "subxt-signer", "symlink", "tar", "tempfile", @@ -4778,7 +4778,6 @@ dependencies = [ "url", "walkdir", "zombienet-sdk", - "zombienet-support", ] [[package]] @@ -8517,16 +8516,19 @@ dependencies = [ [[package]] name = "zombienet-configuration" -version = "0.2.7" -source = "git+https://github.com/r0gue-io/zombienet-sdk?branch=hrmp#49d6c4e2bc7b42c578cde9710171a245cb009dc2" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebbfc98adb25076777967f7aad078e74029e129b102eb0812c425432f8c2be7b" dependencies = [ "anyhow", "lazy_static", "multiaddr", "regex", + "reqwest 0.11.27", "serde", "serde_json", "thiserror", + "tokio", "toml 0.7.8", "url", "zombienet-support", @@ -8534,8 +8536,9 @@ dependencies = [ [[package]] name = "zombienet-orchestrator" -version = "0.2.7" -source = "git+https://github.com/r0gue-io/zombienet-sdk?branch=hrmp#49d6c4e2bc7b42c578cde9710171a245cb009dc2" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b17f4d1d05b3aedf02818eb0f4d5a76664da0e07bb2f7e7d02613e0ef0f316a" dependencies = [ "anyhow", "async-trait", @@ -8543,6 +8546,7 @@ dependencies = [ "glob-match", "hex", "libp2p", + "libsecp256k1", "multiaddr", "rand", "regex", @@ -8565,8 +8569,9 @@ dependencies = [ [[package]] name = "zombienet-prom-metrics-parser" -version = "0.2.7" -source = "git+https://github.com/r0gue-io/zombienet-sdk?branch=hrmp#49d6c4e2bc7b42c578cde9710171a245cb009dc2" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7203390ab88919240da3a3eb06b625b6e300e94f98e04ba5141e9138dc663b7d" dependencies = [ "pest", "pest_derive", @@ -8575,8 +8580,9 @@ dependencies = [ [[package]] name = "zombienet-provider" -version = "0.2.7" -source = "git+https://github.com/r0gue-io/zombienet-sdk?branch=hrmp#49d6c4e2bc7b42c578cde9710171a245cb009dc2" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee02ee957ec39b698798fa6dc2a0d5ba4524198471c37d57755e9685b67fb50c" dependencies = [ "anyhow", "async-trait", @@ -8605,8 +8611,9 @@ dependencies = [ [[package]] name = "zombienet-sdk" -version = "0.2.7" -source = "git+https://github.com/r0gue-io/zombienet-sdk?branch=hrmp#49d6c4e2bc7b42c578cde9710171a245cb009dc2" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f594e67922182277a3da0926f21b693eb5a0c38b32ca7fd6ef16167809fe5064" dependencies = [ "async-trait", "futures", @@ -8621,8 +8628,9 @@ dependencies = [ [[package]] name = "zombienet-support" -version = "0.2.7" -source = "git+https://github.com/r0gue-io/zombienet-sdk?branch=hrmp#49d6c4e2bc7b42c578cde9710171a245cb009dc2" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d3144537df7c8939bbb355cc5245a6dc0078446a6cdaf9272268bd1043c788" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 2a2c55f7..459b9c2d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,8 +61,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 = { version = "0.2.7", git = "https://github.com/r0gue-io/zombienet-sdk", branch = "hrmp" } -zombienet-support = { version = "0.2.7", git = "https://github.com/r0gue-io/zombienet-sdk", branch = "hrmp" } +zombienet-sdk = "0.2.13" git2_credentials = "0.13.0" # pop-cli diff --git a/crates/pop-parachains/Cargo.toml b/crates/pop-parachains/Cargo.toml index c6c14e67..0fa2b300 100644 --- a/crates/pop-parachains/Cargo.toml +++ b/crates/pop-parachains/Cargo.toml @@ -17,9 +17,8 @@ glob.workspace = true serde_json.workspace = true strum.workspace = true strum_macros.workspace = true -# Subxt dependenices need to be at least 0.37 because of the new SignedExtension -subxt-signer = { version = "0.37", features = ["subxt", "sr25519"] } -subxt = "0.37" +subxt-signer.workspace = true +subxt.workspace = true tar.workspace = true tempfile.workspace = true thiserror.workspace = true @@ -34,7 +33,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.4.0" } diff --git a/crates/pop-parachains/src/up/mod.rs b/crates/pop-parachains/src/up/mod.rs index 5970dd1a..45ac9284 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; @@ -279,10 +278,10 @@ impl Zombienet { Ok(relay::default(version, runtime_version, chain, cache).await?) } - /// The name of the relay chain. - pub fn relay_chain(&self) -> &str { - &self.relay_chain.chain - } + /// The name of the relay chain. + pub fn relay_chain(&self) -> &str { + &self.relay_chain.chain + } /// Whether any HRMP channels are to be pre-opened. pub fn hrmp_channels(&self) -> bool {