Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
98dda37
Make essential task panic on error
pgherveou May 21, 2025
3fee4e5
fix
pgherveou May 21, 2025
f2bd274
Update substrate/frame/revive/rpc/src/client.rs
pgherveou May 21, 2025
540d5bb
Update from github-actions[bot] running command 'prdoc --audience run…
github-actions[bot] May 21, 2025
587b6f5
Update substrate/frame/revive/rpc/src/client.rs
pgherveou May 21, 2025
f7621be
fix
pgherveou May 21, 2025
0e0cb6f
update health_api
pgherveou May 21, 2025
74703cb
add error print
pgherveou May 21, 2025
5c71703
nit
pgherveou May 21, 2025
79e34a9
update subxt to 0.41
pgherveou May 21, 2025
79a4ce7
fix subxt method
pgherveou May 21, 2025
152f355
fix err
pgherveou May 22, 2025
402800a
use zombienet-sdk subxt re-export
pgherveou May 22, 2025
91f1faa
rm subxt deps
pgherveou May 22, 2025
c47e1a8
fix
pgherveou May 22, 2025
95b81df
fix misc subxt::
pgherveou May 22, 2025
ab4980a
fixes
pgherveou May 22, 2025
c240c57
misc
pgherveou May 22, 2025
90be5a1
fix
pgherveou May 22, 2025
3615560
Merge branch 'master' into pg/rpc-essential-task
pgherveou May 22, 2025
367bcdf
try to include subxt again in "polkadot-zombienet-sdk-tests"
pgherveou May 23, 2025
4f62393
fix lock
pgherveou May 23, 2025
30d2eb3
Update from github-actions[bot] running command 'fmt'
github-actions[bot] May 23, 2025
99f0c25
test
pgherveou May 23, 2025
0db7c8e
Merge branch 'master' into pg/rpc-essential-task
pgherveou May 23, 2025
3b5189f
Merge branch 'master' into pg/rpc-essential-task
pgherveou May 26, 2025
6f3934c
Update from github-actions[bot] running command 'prdoc --audience run…
github-actions[bot] May 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1380,9 +1380,9 @@ substrate-test-runtime-client = { path = "substrate/test-utils/runtime/client" }
substrate-test-runtime-transaction-pool = { path = "substrate/test-utils/runtime/transaction-pool" }
substrate-test-utils = { path = "substrate/test-utils" }
substrate-wasm-builder = { path = "substrate/utils/wasm-builder", default-features = false }
subxt = { version = "0.38.1", default-features = false }
subxt-metadata = { version = "0.38.0", default-features = false }
subxt-signer = { version = "0.38" }
subxt = { version = "0.41", default-features = false }
subxt-metadata = { version = "0.41", default-features = false }
subxt-signer = { version = "0.41" }
syn = { version = "2.0.87" }
sysinfo = { version = "0.30" }
tar = { version = "0.4" }
Expand Down
3 changes: 1 addition & 2 deletions cumulus/zombienet/zombienet-sdk-helpers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ anyhow = { workspace = true, default-features = true }
codec = { workspace = true, features = ["derive"] }
log = { workspace = true }
polkadot-primitives = { workspace = true, default-features = true }
subxt = { workspace = true, features = ["native"] }
tokio = { workspace = true, features = ["rt-multi-thread", "macros", "time"] }

zombienet-sdk = { workspace = true }
14 changes: 7 additions & 7 deletions cumulus/zombienet/zombienet-sdk-helpers/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ use std::{
collections::{HashMap, HashSet},
ops::Range,
};
use subxt::{
blocks::Block, events::Events, ext::scale_value::value, tx::DynamicPayload, utils::H256,
OnlineClient, PolkadotConfig,
};
use tokio::{
join,
time::{sleep, Duration},
};
use zombienet_sdk::subxt::{
blocks::Block, events::Events, ext::scale_value::value, tx::DynamicPayload, utils::H256,
OnlineClient, PolkadotConfig,
};

// Maximum number of blocks to wait for a session change.
// If it does not arrive for whatever reason, we should not wait forever.
Expand All @@ -30,7 +30,7 @@ pub fn create_assign_core_call(core_and_para: &[(u32, u32)]) -> DynamicPayload {
});
}

subxt::tx::dynamic(
zombienet_sdk::subxt::tx::dynamic(
"Sudo",
"sudo",
vec![value! {
Expand Down Expand Up @@ -238,7 +238,7 @@ pub async fn assert_para_throughput(
///
/// The session change is detected by inspecting the events in the block.
pub async fn wait_for_first_session_change(
blocks_sub: &mut subxt::backend::StreamOfResults<
blocks_sub: &mut zombienet_sdk::subxt::backend::StreamOfResults<
Block<PolkadotConfig, OnlineClient<PolkadotConfig>>,
>,
) -> Result<(), anyhow::Error> {
Expand All @@ -249,7 +249,7 @@ pub async fn wait_for_first_session_change(
///
/// The session change is detected by inspecting the events in the block.
pub async fn wait_for_nth_session_change(
blocks_sub: &mut subxt::backend::StreamOfResults<
blocks_sub: &mut zombienet_sdk::subxt::backend::StreamOfResults<
Block<PolkadotConfig, OnlineClient<PolkadotConfig>>,
>,
mut sessions_to_wait: u32,
Expand Down
2 changes: 0 additions & 2 deletions cumulus/zombienet/zombienet-sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ log = { workspace = true }
polkadot-primitives = { workspace = true, default-features = true }
serde = { workspace = true }
serde_json = { workspace = true }
subxt = { workspace = true }
subxt-signer = { workspace = true }
tokio = { workspace = true, features = ["rt-multi-thread"] }
zombienet-sdk = { workspace = true }
zombienet-orchestrator = { workspace = true }
Expand Down
6 changes: 4 additions & 2 deletions cumulus/zombienet/zombienet-sdk/tests/bootnodes/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ use anyhow::anyhow;
use tokio::time::Duration;

use cumulus_zombienet_sdk_helpers::wait_for_nth_session_change;
use subxt::{OnlineClient, PolkadotConfig};
use zombienet_orchestrator::network::node::LogLineCountOptions;
use zombienet_sdk::{NetworkConfig, NetworkConfigBuilder};
use zombienet_sdk::{
subxt::{OnlineClient, PolkadotConfig},
NetworkConfig, NetworkConfigBuilder,
};

async fn build_network_config() -> Result<NetworkConfig, anyhow::Error> {
let images = zombienet_sdk::environment::get_images_from_env();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ use cumulus_zombienet_sdk_helpers::{
};
use polkadot_primitives::Id as ParaId;
use serde_json::json;
use subxt::{OnlineClient, PolkadotConfig};
use subxt_signer::sr25519::dev;
use zombienet_sdk::{NetworkConfig, NetworkConfigBuilder};
use zombienet_sdk::{
subxt::{OnlineClient, PolkadotConfig},
subxt_signer::sr25519::dev,
NetworkConfig, NetworkConfigBuilder,
};

const PARA_ID: u32 = 2400;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ use anyhow::anyhow;

use cumulus_zombienet_sdk_helpers::assert_para_throughput;
use polkadot_primitives::Id as ParaId;
use subxt::{OnlineClient, PolkadotConfig};
use zombienet_sdk::{LocalFileSystem, Network, NetworkConfigBuilder};
use zombienet_sdk::{
subxt::{OnlineClient, PolkadotConfig},
LocalFileSystem, Network, NetworkConfigBuilder,
};

const PARA_ID: u32 = 2000;
const BEST_BLOCK_METRIC: &str = "block_height{status=\"best\"}";
Expand Down
3 changes: 1 addition & 2 deletions polkadot/zombienet-sdk-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ log = { workspace = true }
polkadot-primitives = { workspace = true, default-features = true }
serde = { workspace = true }
serde_json = { workspace = true }
subxt = { workspace = true }
subxt-signer = { workspace = true }
subxt = { version = "0.38.1", default-features = false }
tokio = { workspace = true, features = ["rt-multi-thread"] }
tokio-util = { workspace = true, features = ["time"] }
zombienet-orchestrator = { workspace = true }
Expand Down
6 changes: 4 additions & 2 deletions polkadot/zombienet-sdk-tests/tests/disabling/slashing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ use cumulus_zombienet_sdk_helpers::{
};
use polkadot_primitives::{BlockNumber, CandidateHash, DisputeState, Id as ParaId, SessionIndex};
use serde_json::json;
use subxt::{OnlineClient, PolkadotConfig};
use tokio::time::Duration;
use tokio_util::time::FutureExt;
use zombienet_orchestrator::network::node::LogLineCountOptions;
use zombienet_sdk::NetworkConfigBuilder;
use zombienet_sdk::{
subxt::{OnlineClient, PolkadotConfig},
NetworkConfigBuilder,
};

#[tokio::test(flavor = "multi_thread")]
async fn dispute_past_session_slashing() -> Result<(), anyhow::Error> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ use anyhow::anyhow;
use cumulus_zombienet_sdk_helpers::{assert_finalized_para_throughput, create_assign_core_call};
use polkadot_primitives::Id as ParaId;
use serde_json::json;
use subxt::{OnlineClient, PolkadotConfig};
use subxt_signer::sr25519::dev;
use zombienet_sdk::NetworkConfigBuilder;
use zombienet_sdk::{
subxt::{OnlineClient, PolkadotConfig},
subxt_signer::sr25519::dev,
NetworkConfigBuilder,
};

#[tokio::test(flavor = "multi_thread")]
async fn basic_3cores_test() -> Result<(), anyhow::Error> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ use cumulus_zombienet_sdk_helpers::{
use polkadot_primitives::{CoreIndex, Id as ParaId};
use serde_json::json;
use std::collections::{BTreeMap, VecDeque};
use subxt::{OnlineClient, PolkadotConfig};
use subxt_signer::sr25519::dev;
use zombienet_sdk::NetworkConfigBuilder;
use zombienet_sdk::{
subxt::{OnlineClient, PolkadotConfig},
subxt_signer::sr25519::dev,
NetworkConfigBuilder,
};

#[tokio::test(flavor = "multi_thread")]
async fn doesnt_break_parachains_test() -> Result<(), anyhow::Error> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ use cumulus_zombienet_sdk_helpers::{
};
use polkadot_primitives::Id as ParaId;
use serde_json::json;
use subxt::{OnlineClient, PolkadotConfig};
use subxt_signer::sr25519::dev;
use zombienet_sdk::NetworkConfigBuilder;
use zombienet_sdk::{
subxt::{OnlineClient, PolkadotConfig},
subxt_signer::sr25519::dev,
NetworkConfigBuilder,
};

#[tokio::test(flavor = "multi_thread")]
async fn slot_based_12cores_test() -> Result<(), anyhow::Error> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ use cumulus_zombienet_sdk_helpers::{
};
use polkadot_primitives::Id as ParaId;
use serde_json::json;
use subxt::{OnlineClient, PolkadotConfig};
use subxt_signer::sr25519::dev;
use zombienet_sdk::NetworkConfigBuilder;
use zombienet_sdk::{
subxt::{OnlineClient, PolkadotConfig},
subxt_signer::sr25519::dev,
NetworkConfigBuilder,
};

#[tokio::test(flavor = "multi_thread")]
async fn slot_based_3cores_test() -> Result<(), anyhow::Error> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ use anyhow::anyhow;
use cumulus_zombienet_sdk_helpers::{assert_finality_lag, assert_para_throughput};
use polkadot_primitives::Id as ParaId;
use serde_json::json;
use subxt::{OnlineClient, PolkadotConfig};
use zombienet_sdk::NetworkConfigBuilder;
use zombienet_sdk::{
subxt::{OnlineClient, PolkadotConfig},
NetworkConfigBuilder,
};

#[tokio::test(flavor = "multi_thread")]
async fn approval_voting_coalescing_test() -> Result<(), anyhow::Error> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ use tokio::time::Duration;
use cumulus_zombienet_sdk_helpers::{assert_finality_lag, assert_finalized_para_throughput};
use polkadot_primitives::Id as ParaId;
use serde_json::json;
use subxt::{OnlineClient, PolkadotConfig};
use zombienet_orchestrator::network::node::LogLineCountOptions;
use zombienet_sdk::NetworkConfigBuilder;
use zombienet_sdk::{
subxt::{OnlineClient, PolkadotConfig},
NetworkConfigBuilder,
};

#[tokio::test(flavor = "multi_thread")]
async fn approved_peer_mixed_validators_test() -> Result<(), anyhow::Error> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ use anyhow::anyhow;
use cumulus_zombienet_sdk_helpers::{assert_finality_lag, assert_finalized_para_throughput};
use polkadot_primitives::Id as ParaId;
use serde_json::json;
use subxt::{OnlineClient, PolkadotConfig};
use zombienet_sdk::NetworkConfigBuilder;
use zombienet_sdk::{
subxt::{OnlineClient, PolkadotConfig},
NetworkConfigBuilder,
};

#[tokio::test(flavor = "multi_thread")]
async fn async_backing_6_seconds_rate_test() -> Result<(), anyhow::Error> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ use tokio::time::Duration;
use cumulus_zombienet_sdk_helpers::{assert_finalized_para_throughput, create_assign_core_call};
use polkadot_primitives::Id as ParaId;
use serde_json::json;
use subxt::{OnlineClient, PolkadotConfig};
use subxt_signer::sr25519::dev;
use zombienet_orchestrator::network::node::LogLineCountOptions;
use zombienet_sdk::NetworkConfigBuilder;
use zombienet_sdk::{
subxt::{OnlineClient, PolkadotConfig},
subxt_signer::sr25519::dev,
NetworkConfigBuilder,
};

const VALIDATOR_COUNT: u8 = 3;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ use tokio::time::Duration;
use cumulus_zombienet_sdk_helpers::assert_para_throughput;
use polkadot_primitives::Id as ParaId;
use serde_json::json;
use subxt::{OnlineClient, PolkadotConfig};
use zombienet_orchestrator::network::node::LogLineCountOptions;
use zombienet_sdk::NetworkConfigBuilder;
use zombienet_sdk::{
subxt::{OnlineClient, PolkadotConfig},
NetworkConfigBuilder,
};

#[tokio::test(flavor = "multi_thread")]
async fn spam_statement_distribution_requests_test() -> Result<(), anyhow::Error> {
Expand Down
Loading
Loading