Preserve artifact cache unless stale

polkadot/node/core/pvf/benches/host_prepare_rococo_runtime.rs

@@ -56,7 +56,7 @@ impl TestHost {
 		&self,
 		code: &[u8],
 		executor_params: ExecutorParams,
-	) -> Result<PrepareStats, PrepareError> {
+	) -> Result<(), PrepareError> {
 		let (result_tx, result_rx) = futures::channel::oneshot::channel();
 
 		let code = sp_maybe_compressed_blob::decompress(code, 16 * 1024 * 1024)

polkadot/node/core/pvf/common/Cargo.toml

@@ -2,6 +2,7 @@
 name = "polkadot-node-core-pvf-common"
 description = "Polkadot crate that contains functionality related to PVFs that is shared by the PVF host and the PVF workers."
 version = "1.0.0"
+build = "build.rs"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

polkadot/node/core/pvf/common/build.rs

@@ -0,0 +1,28 @@
+fn main() {
+	get_wasmtime_version();
+}
+
+pub fn get_wasmtime_version() {
+	// we only care about the root of the tree
+	match std::process::Command::new("cargo")
+		.args(&["tree", "--package=wasmtime", "--depth=0"])
+		.output()
+	{
+		Ok(out) if out.status.success() => {
+			// wasmtime vX.X.X
+			let version = String::from_utf8_lossy(&out.stdout);
+			if let Some(version) = version.strip_prefix("wasmtime v") {
+				println!("cargo:rustc-env=SUBSTRATE_WASMTIME_VERSION={}", version);
+			} else {
+				println!("cargo:warning=build.rs: unexpected result {}", version);
+			}
+		},
+		Ok(out) => println!(
+			"cargo:warning=build.rs: `cargo tree` {}",
+			String::from_utf8_lossy(&out.stderr),
+		),
+		Err(err) => {
+			println!("cargo:warning=build.rs: Could not run `cargo tree`: {}", err);
+		},
+	}
+}

polkadot/node/core/pvf/common/src/lib.rs

@@ -31,6 +31,8 @@ pub use sp_tracing;
 
 const LOG_TARGET: &str = "parachain::pvf-common";
 
+pub const RUNTIME_VERSION: &str = env!("SUBSTRATE_WASMTIME_VERSION");
+
 use std::{
 	io::{self, Read, Write},
 	mem,

polkadot/node/core/pvf/src/artifacts.rs

@@ -58,7 +58,9 @@
 use crate::{host::PrecheckResultSender, LOG_TARGET};
 use always_assert::always;
 use polkadot_core_primitives::Hash;
-use polkadot_node_core_pvf_common::{error::PrepareError, prepare::PrepareStats, pvf::PvfPrepData};
+use polkadot_node_core_pvf_common::{
+	error::PrepareError, prepare::PrepareStats, pvf::PvfPrepData, RUNTIME_VERSION,
+};
 use polkadot_node_primitives::NODE_VERSION;
 use polkadot_parachain_primitives::primitives::ValidationCodeHash;
 use polkadot_primitives::ExecutorParamsHash;
@@ -106,9 +108,10 @@ macro_rules! concat_const {
     }}
 }
 
-const RUNTIME_PREFIX: &str = "wasmtime_";
+const RUNTIME_PREFIX: &str = "wasmtime_v";
 const NODE_PREFIX: &str = "polkadot_v";
-const ARTIFACT_PREFIX: &str = concat_const!(RUNTIME_PREFIX, NODE_PREFIX, NODE_VERSION);
+const ARTIFACT_PREFIX: &str =
+	concat_const!(RUNTIME_PREFIX, RUNTIME_VERSION, "_", NODE_PREFIX, NODE_VERSION);
 
 /// Identifier of an artifact. Encodes a code hash of the PVF and a hash of executor parameter set.
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -413,7 +416,7 @@ impl Artifacts {
 
 #[cfg(test)]
 mod tests {
-	use super::{ArtifactId, Artifacts, ARTIFACT_PREFIX, NODE_VERSION};
+	use super::{ArtifactId, Artifacts, ARTIFACT_PREFIX, NODE_VERSION, RUNTIME_VERSION};
 	use polkadot_primitives::ExecutorParamsHash;
 	use rand::Rng;
 	use sp_core::H256;
@@ -431,10 +434,7 @@ mod tests {
 	}
 
 	fn file_name(code_hash: &str, param_hash: &str, checksum: &str) -> String {
-		format!(
-			"wasmtime_polkadot_v{}_0x{}_0x{}_0x{}",
-			NODE_VERSION, code_hash, param_hash, checksum
-		)
+		format!("{}_0x{}_0x{}_0x{}", ARTIFACT_PREFIX, code_hash, param_hash, checksum)
 	}
 
 	fn create_artifact(
@@ -481,7 +481,10 @@ mod tests {
 
 	#[test]
 	fn artifact_prefix() {
-		assert_eq!(ARTIFACT_PREFIX, format!("wasmtime_polkadot_v{}", NODE_VERSION),)
+		assert_eq!(
+			ARTIFACT_PREFIX,
+			format!("wasmtime_v{}_polkadot_v{}", RUNTIME_VERSION, NODE_VERSION)
+		);
 	}
 
 	#[test]

polkadot/node/core/pvf/tests/it/main.rs

@@ -20,8 +20,7 @@ use assert_matches::assert_matches;
 use parity_scale_codec::Encode as _;
 use polkadot_node_core_pvf::{
 	start, testing::get_and_check_worker_paths, Config, InvalidCandidate, Metrics, PrepareError,
-	PrepareJobKind, PrepareStats, PvfPrepData, ValidationError, ValidationHost,
-	JOB_TIMEOUT_WALL_CLOCK_FACTOR,
+	PrepareJobKind, PvfPrepData, ValidationError, ValidationHost, JOB_TIMEOUT_WALL_CLOCK_FACTOR,
 };
 use polkadot_parachain_primitives::primitives::{BlockData, ValidationParams, ValidationResult};
 use polkadot_primitives::{ExecutorParam, ExecutorParams};

polkadot/xcm/procedural/tests/ui.rs

@@ -21,7 +21,7 @@
 fn ui() {
 	// Only run the ui tests when `RUN_UI_TESTS` is set.
 	if std::env::var("RUN_UI_TESTS").is_err() {
-		return;
+		return
 	}
 
 	// As trybuild is using `cargo check`, we don't need the real WASM binaries.

substrate/client/chain-spec/src/chain_spec.rs

@@ -784,9 +784,7 @@ fn json_eval_value_at_key(
 	path: &mut VecDeque<&str>,
 	fun: &dyn Fn(&json::Value) -> bool,
 ) -> bool {
-	let Some(key) = path.pop_front() else {
-		return false;
-	};
+	let Some(key) = path.pop_front() else { return false };
 
 	if path.is_empty() {
 		doc.as_object().map_or(false, |o| o.get(key).map_or(false, |v| fun(v)))