Merge pull request #4806 from namada-net/mergify/bp/maint-libs-0.251/pr-4799

safer wasm cache key (backport #4799)

Author: mergify[bot]

.changelog/unreleased/improvements/4799-safer-wasm-cache-key.md

@@ -0,0 +1,2 @@
+- Use more precise version for wasm cache key to avoid collisions of serialized
+  artifacts ([\#4799](https://github.com/anoma/namada/pull/4799))

Cargo.lock

@@ -66,3 +66,6 @@ tempfile.workspace = true
 test-log.workspace = true
 wasmer-compiler.workspace = true
 wasmer-types.workspace = true
+
+[build-dependencies]
+git2.workspace = true

crates/vm/Cargo.toml

@@ -0,0 +1,17 @@
+use git2::{DescribeFormatOptions, DescribeOptions, Repository};
+
+fn main() {
+    // Discover the repository version, if it exists
+    println!("cargo:rerun-if-changed=../../.git");
+    let describe_opts = DescribeOptions::new();
+    let mut describe_format = DescribeFormatOptions::new();
+    describe_format.dirty_suffix("-dirty");
+    let version = Repository::discover(".")
+        .ok()
+        .as_ref()
+        .and_then(|repo| repo.describe(&describe_opts).ok())
+        .and_then(|describe| describe.format(Some(&describe_format)).ok());
+    if let Some(version) = version {
+        println!("cargo:rustc-env=GIT_DESCRIBED={version}");
+    }
+}

crates/vm/build.rs

@@ -101,9 +101,11 @@ impl<N: CacheName, A: WasmCacheAccess> Cache<N, A> {
             wasmer::Target::default().hash(&mut hasher);
             hasher.finish()
         };
+        let version_prefix =
+            option_env!("GIT_DESCRIBED").unwrap_or(env!("CARGO_PKG_VERSION"));
         let version = format!(
-            "{}_{:x}",
-            concat!(env!("CARGO_PKG_VERSION"), "_", env!("RUSTUP_TOOLCHAIN")),
+            "{version_prefix}{}{:x}",
+            concat!("_", env!("RUSTUP_TOOLCHAIN"), "_"),
             target_hash,
         );
         let dir = dir.into().join(version);