Merge branch 'ulan/run-819' into 'master'

RUN-819: Upgrade `wasmtime` to version 13.0.1 Release notes: - https://github.com/bytecodealliance/wasmtime/blob/main/RELEASES.md#1300 Changes: - bytecodealliance/wasmtime@release-11.0.0...release-13.0.0 See merge request dfinity-lab/public/ic!15607
dfinity · Oct 31, 2023 · 3d44d7e · 3d44d7e
2 parents f28a285 + db296cc
commit 3d44d7e
Show file tree

Hide file tree

Showing 11 changed files with 2,644 additions and 1,980 deletions.
diff --git a/Cargo.Bazel.Fuzzing.json.lock b/Cargo.Bazel.Fuzzing.json.lock
diff --git a/Cargo.Bazel.Fuzzing.toml.lock b/Cargo.Bazel.Fuzzing.toml.lock
diff --git a/Cargo.Bazel.StaticOpenSSL.json.lock b/Cargo.Bazel.StaticOpenSSL.json.lock
diff --git a/Cargo.Bazel.StaticOpenSSL.toml.lock b/Cargo.Bazel.StaticOpenSSL.toml.lock
diff --git a/Cargo.Bazel.json.lock b/Cargo.Bazel.json.lock
diff --git a/Cargo.Bazel.toml.lock b/Cargo.Bazel.toml.lock
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bazel/external_crates.bzl b/bazel/external_crates.bzl
@@ -1299,19 +1299,18 @@ def external_crates_repository(name, static_openssl, cargo_lockfile, lockfile, s
                 version = "^0.2.50",
             ),
             "wasmtime": crate.spec(
-                version = "^11.0.2",
+                version = "^13.0.1",
                 default_features = False,
                 features = [
                     "cranelift",
                     "parallel-compilation",
-                    "posix-signals-on-macos",
                 ],
             ),
             "wasmtime-environ": crate.spec(
-                version = "^11.0.2",
+                version = "^13.0.1",
             ),
             "wasmtime-runtime": crate.spec(
-                version = "^11.0.2",
+                version = "^13.0.1",
             ),
             "wast": crate.spec(
                 version = "^53.0.0",

diff --git a/rs/embedders/Cargo.toml b/rs/embedders/Cargo.toml
@@ -30,13 +30,12 @@ slog = { version = "2.5.2", features = [
     "release_max_level_debug",
 ] }
 slog-term = "2.6.0"
-wasmtime = { version = "11.0.2", default-features = false, features = [
+wasmtime = { version = "13.0.1", default-features = false, features = [
     'cranelift',
     'parallel-compilation',
-    'posix-signals-on-macos',
 ] }
-wasmtime-environ = "11.0.2"
-wasmtime-runtime = "11.0.2"
+wasmtime-environ = "13.0.1"
+wasmtime-runtime = "13.0.1"
 wasm-encoder = "0.31.0"
 wasmparser = "0.109.0"
 rayon = "1.5.1"

diff --git a/rs/embedders/src/wasmtime_embedder.rs b/rs/embedders/src/wasmtime_embedder.rs
@@ -166,6 +166,8 @@ struct WasmMemoryInfo {
 fn disable_unused_features(config: &mut wasmtime::Config) {
     config.wasm_function_references(false);
     config.wasm_relaxed_simd(false);
+    // The signal handler uses Posix signals, not Mach ports on MacOS.
+    config.macos_use_mach_ports(false);
 }
 
 pub struct WasmtimeEmbedder {

diff --git a/rs/rosetta-api/icrc1/ledger/sm-tests/Cargo.toml b/rs/rosetta-api/icrc1/ledger/sm-tests/Cargo.toml
@@ -27,8 +27,8 @@ cddl = "0.9.0-beta.1"
 hex = "0.4.2"
 serde = { workspace = true }
 futures = { workspace = true }
-icrc1-test-env = { git = "https://github.com/dfinity/ICRC-1", rev = "bdcf39e32a12185fbcec33897001d93c901d6689" }
-icrc1-test-suite = { git = "https://github.com/dfinity/ICRC-1", rev = "bdcf39e32a12185fbcec33897001d93c901d6689" }
+icrc1-test-env = { git = "https://github.com/dfinity/ICRC-1", rev = "c0c2770c4f62cae9821f650ed8f36ebcc772182c" }
+icrc1-test-suite = { git = "https://github.com/dfinity/ICRC-1", rev = "c0c2770c4f62cae9821f650ed8f36ebcc772182c" }
 
 [features]
 default = []