[stable2506] Backport #8592

.github/env

@@ -1 +1 @@
-IMAGE="docker.io/paritytech/ci-unified:bullseye-1.84.1-2025-01-28-v202502131220"
+IMAGE="docker.io/paritytech/ci-unified:bullseye-1.88.0-2025-06-27-v202506301118"

.github/workflows/build-misc.yml

@@ -69,7 +69,7 @@ jobs:
 
       - name: Build
         id: required
-        run: forklift cargo +nightly check -p pallet-revive-uapi --no-default-features --target riscv64imac-unknown-none-elf -Zbuild-std=core
+        run: cargo +nightly check -p pallet-revive-uapi --no-default-features --target riscv64imac-unknown-none-elf -Zbuild-std=core
       - name: Stop all workflows if failed
         if: ${{ failure() && steps.required.conclusion == 'failure' && !github.event.pull_request.head.repo.fork }}
         uses: ./.github/actions/workflow-stopper

Cargo.toml

@@ -1148,9 +1148,9 @@ polkadot-subsystem-bench = { path = "polkadot/node/subsystem-bench" }
 polkadot-test-client = { path = "polkadot/node/test/client" }
 polkadot-test-runtime = { path = "polkadot/runtime/test-runtime" }
 polkadot-test-service = { path = "polkadot/node/test/service" }
-polkavm = { version = "0.24.0", default-features = false }
-polkavm-derive = "0.24.0"
-polkavm-linker = "0.24.0"
+polkavm = { version = "0.26.0", default-features = false }
+polkavm-derive = "0.26.0"
+polkavm-linker = "0.26.0"
 portpicker = { version = "0.1.1" }
 pretty_assertions = { version = "1.3.0" }
 primitive-types = { version = "0.13.1", default-features = false, features = ["num-traits"] }

cumulus/parachains/runtimes/testing/yet-another-parachain/Cargo.toml

@@ -49,9 +49,9 @@ sp-runtime = { workspace = true }
 sp-session = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
+xcm.workspace = true
 xcm-builder.workspace = true
 xcm-executor.workspace = true
-xcm.workspace = true
 
 # Polkadot
 polkadot-parachain-primitives = { workspace = true }

polkadot/node/subsystem-bench/src/cli/subsystem-bench.rs

@@ -127,14 +127,14 @@ impl BenchCli {
 			.expect("File exists")
 			.test_configurations;
 		let num_steps = test_sequence.len();
-		gum::info!("{}", format!("Sequence contains {} step(s)", num_steps).bright_purple());
+		gum::info!("{}", format!("Sequence contains {num_steps} step(s)").bright_purple());
 
 		for (index, CliTestConfiguration { objective, mut test_config }) in
 			test_sequence.into_iter().enumerate()
 		{
 			let benchmark_name = format!("{} #{} {}", &self.path, index + 1, objective);
 			gum::info!(target: LOG_TARGET, "{}", format!("Step {}/{}", index + 1, num_steps).bright_purple(),);
-			gum::info!(target: LOG_TARGET, "[{}] {}", format!("objective = {:?}", objective).green(), test_config);
+			gum::info!(target: LOG_TARGET, "[{}] {}", format!("objective = {objective:?}").green(), test_config);
 			test_config.generate_pov_sizes();
 
 			let usage = match objective {

polkadot/node/subsystem-bench/src/lib/approval/mod.rs

@@ -1042,7 +1042,7 @@ pub async fn bench_approvals_run(
 
 		let block_time = Instant::now().sub(block_start_ts).as_millis() as u64;
 		env.metrics().set_block_time(block_time);
-		gum::info!("Block time {}", format!("{:?}ms", block_time).cyan());
+		gum::info!("Block time {}", format!("{block_time:?}ms").cyan());
 
 		system_clock
 			.wait(slot_number_to_tick(SLOT_DURATION_MILLIS, current_slot + 1))
@@ -1170,7 +1170,7 @@ pub async fn bench_approvals_run(
 	let duration: u128 = start_marker.elapsed().as_millis();
 	gum::info!(
 		"All blocks processed in {} total_sent_messages_to_node {} total_sent_messages_from_node {} num_unique_messages {}",
-		format!("{:?}ms", duration).cyan(),
+		format!("{duration:?}ms").cyan(),
 		state.total_sent_messages_to_node.load(std::sync::atomic::Ordering::SeqCst),
 		state.total_sent_messages_from_node.load(std::sync::atomic::Ordering::SeqCst),
 		state.total_unique_messages.load(std::sync::atomic::Ordering::SeqCst)

polkadot/node/subsystem-bench/src/lib/availability/mod.rs

@@ -351,12 +351,12 @@ pub async fn benchmark_availability_read(
 
 		let block_time = Instant::now().sub(block_start_ts).as_millis() as u64;
 		env.metrics().set_block_time(block_time);
-		gum::info!(target: LOG_TARGET, "All work for block completed in {}", format!("{:?}ms", block_time).cyan());
+		gum::info!(target: LOG_TARGET, "All work for block completed in {}", format!("{block_time:?}ms").cyan());
 	}
 
 	let duration: u128 = test_start.elapsed().as_millis();
 	let availability_bytes = availability_bytes / 1024;
-	gum::info!(target: LOG_TARGET, "All blocks processed in {}", format!("{:?}ms", duration).cyan());
+	gum::info!(target: LOG_TARGET, "All blocks processed in {}", format!("{duration:?}ms").cyan());
 	gum::info!(target: LOG_TARGET,
 		"Throughput: {}",
 		format!("{} KiB/block", availability_bytes / env.config().num_blocks as u128).bright_red()
@@ -490,11 +490,11 @@ pub async fn benchmark_availability_write(
 
 		let block_time = Instant::now().sub(block_start_ts).as_millis() as u64;
 		env.metrics().set_block_time(block_time);
-		gum::info!(target: LOG_TARGET, "All work for block completed in {}", format!("{:?}ms", block_time).cyan());
+		gum::info!(target: LOG_TARGET, "All work for block completed in {}", format!("{block_time:?}ms").cyan());
 	}
 
 	let duration: u128 = test_start.elapsed().as_millis();
-	gum::info!(target: LOG_TARGET, "All blocks processed in {}", format!("{:?}ms", duration).cyan());
+	gum::info!(target: LOG_TARGET, "All blocks processed in {}", format!("{duration:?}ms").cyan());
 	gum::info!(target: LOG_TARGET,
 		"Avg block time: {}",
 		format!("{} ms", test_start.elapsed().as_millis() / env.config().num_blocks as u128).red()

polkadot/node/subsystem-bench/src/lib/availability/test_state.rs

@@ -181,7 +181,7 @@ impl TestState {
 
 		// Generate all candidates
 		let candidates_count = config.n_cores * config.num_blocks;
-		gum::info!(target: LOG_TARGET,"{}", format!("Pre-generating {} candidates.", candidates_count).bright_blue());
+		gum::info!(target: LOG_TARGET,"{}", format!("Pre-generating {candidates_count} candidates.").bright_blue());
 		test_state.candidates = (0..candidates_count)
 			.map(|index| {
 				let pov_size = test_state.pov_sizes.next().expect("This is a cycle; qed");