From dd36bb638a5b69048246ebc641bdf7fb2fc73de6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Oct 2024 08:57:23 +0000
Subject: [PATCH] Bump wasmi from 0.36.0 to 0.38.0 (#1981)

* Bump wasmi from 0.36.0 to 0.38.0

Bumps [wasmi](https://github.com/wasmi-labs/wasmi) from 0.36.0 to 0.38.0.
- [Release notes](https://github.com/wasmi-labs/wasmi/releases)
- [Changelog](https://github.com/wasmi-labs/wasmi/blob/main/CHANGELOG.md)
- [Commits](https://github.com/wasmi-labs/wasmi/compare/v0.36.0...v0.38.0)

---
updated-dependencies:
- dependency-name: wasmi
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Disable multi-memory

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
---
 Cargo.lock                         | 35 ++++++++++++++----------------
 lib/Cargo.toml                     |  2 +-
 lib/src/executor/vm/interpreter.rs |  1 +
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 817dddcb3e..57d99db7b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1669,17 +1669,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-derive"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "num-integer"
 version = "0.1.46"
@@ -2823,26 +2812,25 @@ dependencies = [
 
 [[package]]
 name = "wasmi"
-version = "0.36.5"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446ddc18185880ff32de907a809864283d18f9de568c23d46464b6231973d595"
+checksum = "b07e84e3bcdab2f4301827623260ada2557596ca462f7470b60f5182a25270b1"
 dependencies = [
  "arrayvec 0.7.6",
  "multi-stash",
- "num-derive",
- "num-traits",
  "smallvec",
  "spin",
  "wasmi_collections",
  "wasmi_core",
+ "wasmi_ir",
  "wasmparser-nostd",
 ]
 
 [[package]]
 name = "wasmi_collections"
-version = "0.36.5"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eddc10bfb0069e913399ebd66c5a72c7d9aceabddcaa0296f062a55ab61d404"
+checksum = "0d0fd5f4f2c4fe0c98554bb7293108ed2b1d0c124dce0974f999de7d517d37bc"
 dependencies = [
  "ahash",
  "hashbrown 0.14.5",
@@ -2851,9 +2839,9 @@ dependencies = [
 
 [[package]]
 name = "wasmi_core"
-version = "0.36.5"
+version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f08b12621457c17cfd5349cce25029eeac3769b63b1b02bd850d595a00f375ff"
+checksum = "76a5f7bbd933a0fb3bac6c541f8bd90c0c8adcd91bb3ac088a2088995325b3d9"
 dependencies = [
  "downcast-rs",
  "libm",
@@ -2861,6 +2849,15 @@ dependencies = [
  "paste",
 ]
 
+[[package]]
+name = "wasmi_ir"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3345445247388df2b5b35250a30c9209c27c8d2c6db1bf4c89b65636264bf9"
+dependencies = [
+ "wasmi_core",
+]
+
 [[package]]
 name = "wasmparser"
 version = "0.215.0"
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
index ca46d50c49..cae2a20406 100644
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -76,7 +76,7 @@ siphasher = { version = "1.0.1", default-features = false }
 slab = { version = "0.4.8", default-features = false }
 smallvec = { version = "1.13.2", default-features = false }
 twox-hash = { version = "1.6.3", default-features = false }
-wasmi = { version = "0.36.0", default-features = false }
+wasmi = { version = "0.38.0", default-features = false }
 x25519-dalek = { version = "2.0.0-rc.3", default-features = false, features = ["alloc", "precomputed-tables", "static_secrets", "zeroize"] }
 zeroize = { version = "1.7.0", default-features = false, features = ["alloc"] }
 
diff --git a/lib/src/executor/vm/interpreter.rs b/lib/src/executor/vm/interpreter.rs
index b720e5f2d4..3a3a42925d 100644
--- a/lib/src/executor/vm/interpreter.rs
+++ b/lib/src/executor/vm/interpreter.rs
@@ -68,6 +68,7 @@ impl InterpreterPrototype {
             config.wasm_mutable_global(false);
             config.wasm_saturating_float_to_int(false);
             config.wasm_tail_call(false);
+            config.wasm_multi_memory(false);
             config.compilation_mode(compilation_mode);
 
             wasmi::Engine::new(&config)