From db9d654d65333804d4dbb02329fb997fde75ac7a Mon Sep 17 00:00:00 2001
From: Christoph Otter <chris@confio.gmbh>
Date: Wed, 31 May 2023 09:07:38 +0200
Subject: [PATCH 01/13] Update to wasmer 4

---
 Cargo.lock                                   | 32 ++++++++++----------
 packages/vm/Cargo.toml                       |  4 +--
 packages/vm/src/cache.rs                     |  2 +-
 packages/vm/src/modules/file_system_cache.rs |  2 +-
 packages/vm/src/wasm_backend/store.rs        |  1 +
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e2121d4bc4..29e803e520 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2356,9 +2356,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78caedecd8cb71ed47ccca03b68d69414a3d278bb031e6f93f15759344efdd52"
+checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -2384,9 +2384,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726a8450541af4a57c34af7b6973fdbfc79f896cc7e733429577dfd1d1687180"
+checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -2407,9 +2407,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e5633f90f372563ebbdf3f9799c7b29ba11c90e56cf9b54017112d2e656c95"
+checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -2426,9 +2426,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d38957de6f452115c0af3ff08cec268ee248d665b54d4bbf7da60b7453cb97"
+checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -2445,9 +2445,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97901fdbaae383dbb90ea162cc3a76a9fa58ac39aec7948b4c0b9bbef9307738"
+checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -2457,9 +2457,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e028013811035111beb768074b6ccc09eabd77811b1e01fd099b5471924ca16"
+checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -2468,9 +2468,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67f1f2839f4f61509550e4ddcd0e658e19f3af862b51c79fda15549d735d659b"
+checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -2484,9 +2484,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043118ec4f16d1714fed3aab758b502b864bd865e1d5188626c9ad290100563f"
+checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml
index 1c78aafd0d..90a17b0907 100644
--- a/packages/vm/Cargo.toml
+++ b/packages/vm/Cargo.toml
@@ -49,8 +49,8 @@ serde = { version = "1.0.103", default-features = false, features = ["derive", "
 serde_json = "1.0.40"
 sha2 = "0.10.3"
 thiserror = "1.0.26"
-wasmer = { version = "=3.3.0", default-features = false, features = ["cranelift", "singlepass"] }
-wasmer-middlewares = "=3.3.0"
+wasmer = { version = "=4.0.0-alpha.1", default-features = false, features = ["cranelift", "singlepass"] }
+wasmer-middlewares = "=4.0.0-alpha.1"
 
 # Dependencies that we do not use ourself. We add those entries
 # to bump the min version of them.
diff --git a/packages/vm/src/cache.rs b/packages/vm/src/cache.rs
index 1206dbe5e6..019e4e72a7 100644
--- a/packages/vm/src/cache.rs
+++ b/packages/vm/src/cache.rs
@@ -4,7 +4,7 @@ use std::io::{Read, Write};
 use std::marker::PhantomData;
 use std::path::{Path, PathBuf};
 use std::sync::Mutex;
-use wasmer::Engine;
+use wasmer::{Engine, NativeEngineExt};
 
 use crate::backend::{Backend, BackendApi, Querier, Storage};
 use crate::capabilities::required_capabilities_from_module;
diff --git a/packages/vm/src/modules/file_system_cache.rs b/packages/vm/src/modules/file_system_cache.rs
index 0978187743..dd94b58341 100644
--- a/packages/vm/src/modules/file_system_cache.rs
+++ b/packages/vm/src/modules/file_system_cache.rs
@@ -110,7 +110,7 @@ impl FileSystemCache {
         let filename = checksum.to_hex();
         let file_path = self.modules_path.join(filename);
 
-        let result = unsafe { Module::deserialize_from_file(engine, &file_path) };
+        let result = unsafe { Module::deserialize_from_file_unchecked(engine, &file_path) };
         match result {
             Ok(module) => {
                 let module_size = module_size(&file_path)?;
diff --git a/packages/vm/src/wasm_backend/store.rs b/packages/vm/src/wasm_backend/store.rs
index 5c9fad45d9..bd44ccc4b9 100644
--- a/packages/vm/src/wasm_backend/store.rs
+++ b/packages/vm/src/wasm_backend/store.rs
@@ -1,6 +1,7 @@
 use std::sync::Arc;
 #[cfg(feature = "cranelift")]
 use wasmer::Cranelift;
+use wasmer::NativeEngineExt;
 #[cfg(not(feature = "cranelift"))]
 use wasmer::Singlepass;
 use wasmer::{

From f1fddb7c4376b564efccb29f7016c113083f64da Mon Sep 17 00:00:00 2001
From: Christoph Otter <chris@confio.gmbh>
Date: Wed, 31 May 2023 10:28:41 +0200
Subject: [PATCH 02/13] Fix contract lock files

---
 contracts/burner/Cargo.lock           | 32 +++++++++++++--------------
 contracts/crypto-verify/Cargo.lock    | 32 +++++++++++++--------------
 contracts/cyberpunk/Cargo.lock        | 32 +++++++++++++--------------
 contracts/floaty/Cargo.lock           | 32 +++++++++++++--------------
 contracts/hackatom/Cargo.lock         | 32 +++++++++++++--------------
 contracts/ibc-reflect-send/Cargo.lock | 32 +++++++++++++--------------
 contracts/ibc-reflect/Cargo.lock      | 32 +++++++++++++--------------
 contracts/queue/Cargo.lock            | 32 +++++++++++++--------------
 contracts/reflect/Cargo.lock          | 32 +++++++++++++--------------
 contracts/staking/Cargo.lock          | 32 +++++++++++++--------------
 contracts/virus/Cargo.lock            | 32 +++++++++++++--------------
 11 files changed, 176 insertions(+), 176 deletions(-)

diff --git a/contracts/burner/Cargo.lock b/contracts/burner/Cargo.lock
index 314a1cf112..55521aa7af 100644
--- a/contracts/burner/Cargo.lock
+++ b/contracts/burner/Cargo.lock
@@ -1659,9 +1659,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78caedecd8cb71ed47ccca03b68d69414a3d278bb031e6f93f15759344efdd52"
+checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1687,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726a8450541af4a57c34af7b6973fdbfc79f896cc7e733429577dfd1d1687180"
+checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1710,9 +1710,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e5633f90f372563ebbdf3f9799c7b29ba11c90e56cf9b54017112d2e656c95"
+checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1729,9 +1729,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d38957de6f452115c0af3ff08cec268ee248d665b54d4bbf7da60b7453cb97"
+checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1748,9 +1748,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97901fdbaae383dbb90ea162cc3a76a9fa58ac39aec7948b4c0b9bbef9307738"
+checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1760,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e028013811035111beb768074b6ccc09eabd77811b1e01fd099b5471924ca16"
+checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1771,9 +1771,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67f1f2839f4f61509550e4ddcd0e658e19f3af862b51c79fda15549d735d659b"
+checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1787,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043118ec4f16d1714fed3aab758b502b864bd865e1d5188626c9ad290100563f"
+checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/crypto-verify/Cargo.lock b/contracts/crypto-verify/Cargo.lock
index 4724f87c89..df789125a7 100644
--- a/contracts/crypto-verify/Cargo.lock
+++ b/contracts/crypto-verify/Cargo.lock
@@ -1702,9 +1702,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78caedecd8cb71ed47ccca03b68d69414a3d278bb031e6f93f15759344efdd52"
+checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1730,9 +1730,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726a8450541af4a57c34af7b6973fdbfc79f896cc7e733429577dfd1d1687180"
+checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1753,9 +1753,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e5633f90f372563ebbdf3f9799c7b29ba11c90e56cf9b54017112d2e656c95"
+checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1772,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d38957de6f452115c0af3ff08cec268ee248d665b54d4bbf7da60b7453cb97"
+checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1791,9 +1791,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97901fdbaae383dbb90ea162cc3a76a9fa58ac39aec7948b4c0b9bbef9307738"
+checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1803,9 +1803,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e028013811035111beb768074b6ccc09eabd77811b1e01fd099b5471924ca16"
+checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1814,9 +1814,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67f1f2839f4f61509550e4ddcd0e658e19f3af862b51c79fda15549d735d659b"
+checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1830,9 +1830,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043118ec4f16d1714fed3aab758b502b864bd865e1d5188626c9ad290100563f"
+checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/cyberpunk/Cargo.lock b/contracts/cyberpunk/Cargo.lock
index 37d9a76bcc..377691eeb5 100644
--- a/contracts/cyberpunk/Cargo.lock
+++ b/contracts/cyberpunk/Cargo.lock
@@ -1799,9 +1799,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78caedecd8cb71ed47ccca03b68d69414a3d278bb031e6f93f15759344efdd52"
+checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1827,9 +1827,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726a8450541af4a57c34af7b6973fdbfc79f896cc7e733429577dfd1d1687180"
+checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1850,9 +1850,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e5633f90f372563ebbdf3f9799c7b29ba11c90e56cf9b54017112d2e656c95"
+checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1869,9 +1869,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d38957de6f452115c0af3ff08cec268ee248d665b54d4bbf7da60b7453cb97"
+checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1888,9 +1888,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97901fdbaae383dbb90ea162cc3a76a9fa58ac39aec7948b4c0b9bbef9307738"
+checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1900,9 +1900,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e028013811035111beb768074b6ccc09eabd77811b1e01fd099b5471924ca16"
+checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1911,9 +1911,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67f1f2839f4f61509550e4ddcd0e658e19f3af862b51c79fda15549d735d659b"
+checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1927,9 +1927,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043118ec4f16d1714fed3aab758b502b864bd865e1d5188626c9ad290100563f"
+checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/floaty/Cargo.lock b/contracts/floaty/Cargo.lock
index 3601db398d..4340d4df12 100644
--- a/contracts/floaty/Cargo.lock
+++ b/contracts/floaty/Cargo.lock
@@ -1660,9 +1660,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78caedecd8cb71ed47ccca03b68d69414a3d278bb031e6f93f15759344efdd52"
+checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1688,9 +1688,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726a8450541af4a57c34af7b6973fdbfc79f896cc7e733429577dfd1d1687180"
+checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1711,9 +1711,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e5633f90f372563ebbdf3f9799c7b29ba11c90e56cf9b54017112d2e656c95"
+checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1730,9 +1730,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d38957de6f452115c0af3ff08cec268ee248d665b54d4bbf7da60b7453cb97"
+checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1749,9 +1749,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97901fdbaae383dbb90ea162cc3a76a9fa58ac39aec7948b4c0b9bbef9307738"
+checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1761,9 +1761,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e028013811035111beb768074b6ccc09eabd77811b1e01fd099b5471924ca16"
+checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1772,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67f1f2839f4f61509550e4ddcd0e658e19f3af862b51c79fda15549d735d659b"
+checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1788,9 +1788,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043118ec4f16d1714fed3aab758b502b864bd865e1d5188626c9ad290100563f"
+checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/hackatom/Cargo.lock b/contracts/hackatom/Cargo.lock
index 6bf57323fb..6ad4ef2f67 100644
--- a/contracts/hackatom/Cargo.lock
+++ b/contracts/hackatom/Cargo.lock
@@ -1661,9 +1661,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78caedecd8cb71ed47ccca03b68d69414a3d278bb031e6f93f15759344efdd52"
+checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1689,9 +1689,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726a8450541af4a57c34af7b6973fdbfc79f896cc7e733429577dfd1d1687180"
+checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1712,9 +1712,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e5633f90f372563ebbdf3f9799c7b29ba11c90e56cf9b54017112d2e656c95"
+checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1731,9 +1731,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d38957de6f452115c0af3ff08cec268ee248d665b54d4bbf7da60b7453cb97"
+checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1750,9 +1750,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97901fdbaae383dbb90ea162cc3a76a9fa58ac39aec7948b4c0b9bbef9307738"
+checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1762,9 +1762,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e028013811035111beb768074b6ccc09eabd77811b1e01fd099b5471924ca16"
+checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1773,9 +1773,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67f1f2839f4f61509550e4ddcd0e658e19f3af862b51c79fda15549d735d659b"
+checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1789,9 +1789,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043118ec4f16d1714fed3aab758b502b864bd865e1d5188626c9ad290100563f"
+checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/ibc-reflect-send/Cargo.lock b/contracts/ibc-reflect-send/Cargo.lock
index cea2b67e8d..49144c7c5c 100644
--- a/contracts/ibc-reflect-send/Cargo.lock
+++ b/contracts/ibc-reflect-send/Cargo.lock
@@ -1659,9 +1659,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78caedecd8cb71ed47ccca03b68d69414a3d278bb031e6f93f15759344efdd52"
+checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1687,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726a8450541af4a57c34af7b6973fdbfc79f896cc7e733429577dfd1d1687180"
+checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1710,9 +1710,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e5633f90f372563ebbdf3f9799c7b29ba11c90e56cf9b54017112d2e656c95"
+checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1729,9 +1729,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d38957de6f452115c0af3ff08cec268ee248d665b54d4bbf7da60b7453cb97"
+checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1748,9 +1748,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97901fdbaae383dbb90ea162cc3a76a9fa58ac39aec7948b4c0b9bbef9307738"
+checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1760,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e028013811035111beb768074b6ccc09eabd77811b1e01fd099b5471924ca16"
+checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1771,9 +1771,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67f1f2839f4f61509550e4ddcd0e658e19f3af862b51c79fda15549d735d659b"
+checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1787,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043118ec4f16d1714fed3aab758b502b864bd865e1d5188626c9ad290100563f"
+checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/ibc-reflect/Cargo.lock b/contracts/ibc-reflect/Cargo.lock
index 9320bc6b6a..65c2688e4b 100644
--- a/contracts/ibc-reflect/Cargo.lock
+++ b/contracts/ibc-reflect/Cargo.lock
@@ -1659,9 +1659,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78caedecd8cb71ed47ccca03b68d69414a3d278bb031e6f93f15759344efdd52"
+checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1687,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726a8450541af4a57c34af7b6973fdbfc79f896cc7e733429577dfd1d1687180"
+checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1710,9 +1710,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e5633f90f372563ebbdf3f9799c7b29ba11c90e56cf9b54017112d2e656c95"
+checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1729,9 +1729,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d38957de6f452115c0af3ff08cec268ee248d665b54d4bbf7da60b7453cb97"
+checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1748,9 +1748,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97901fdbaae383dbb90ea162cc3a76a9fa58ac39aec7948b4c0b9bbef9307738"
+checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1760,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e028013811035111beb768074b6ccc09eabd77811b1e01fd099b5471924ca16"
+checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1771,9 +1771,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67f1f2839f4f61509550e4ddcd0e658e19f3af862b51c79fda15549d735d659b"
+checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1787,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043118ec4f16d1714fed3aab758b502b864bd865e1d5188626c9ad290100563f"
+checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/queue/Cargo.lock b/contracts/queue/Cargo.lock
index f4ac8cbcdc..d64af50363 100644
--- a/contracts/queue/Cargo.lock
+++ b/contracts/queue/Cargo.lock
@@ -1659,9 +1659,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78caedecd8cb71ed47ccca03b68d69414a3d278bb031e6f93f15759344efdd52"
+checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1687,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726a8450541af4a57c34af7b6973fdbfc79f896cc7e733429577dfd1d1687180"
+checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1710,9 +1710,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e5633f90f372563ebbdf3f9799c7b29ba11c90e56cf9b54017112d2e656c95"
+checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1729,9 +1729,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d38957de6f452115c0af3ff08cec268ee248d665b54d4bbf7da60b7453cb97"
+checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1748,9 +1748,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97901fdbaae383dbb90ea162cc3a76a9fa58ac39aec7948b4c0b9bbef9307738"
+checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1760,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e028013811035111beb768074b6ccc09eabd77811b1e01fd099b5471924ca16"
+checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1771,9 +1771,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67f1f2839f4f61509550e4ddcd0e658e19f3af862b51c79fda15549d735d659b"
+checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1787,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043118ec4f16d1714fed3aab758b502b864bd865e1d5188626c9ad290100563f"
+checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/reflect/Cargo.lock b/contracts/reflect/Cargo.lock
index ce9e6bbe72..908d3c2491 100644
--- a/contracts/reflect/Cargo.lock
+++ b/contracts/reflect/Cargo.lock
@@ -1660,9 +1660,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78caedecd8cb71ed47ccca03b68d69414a3d278bb031e6f93f15759344efdd52"
+checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1688,9 +1688,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726a8450541af4a57c34af7b6973fdbfc79f896cc7e733429577dfd1d1687180"
+checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1711,9 +1711,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e5633f90f372563ebbdf3f9799c7b29ba11c90e56cf9b54017112d2e656c95"
+checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1730,9 +1730,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d38957de6f452115c0af3ff08cec268ee248d665b54d4bbf7da60b7453cb97"
+checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1749,9 +1749,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97901fdbaae383dbb90ea162cc3a76a9fa58ac39aec7948b4c0b9bbef9307738"
+checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1761,9 +1761,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e028013811035111beb768074b6ccc09eabd77811b1e01fd099b5471924ca16"
+checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1772,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67f1f2839f4f61509550e4ddcd0e658e19f3af862b51c79fda15549d735d659b"
+checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1788,9 +1788,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043118ec4f16d1714fed3aab758b502b864bd865e1d5188626c9ad290100563f"
+checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/staking/Cargo.lock b/contracts/staking/Cargo.lock
index 8a6d2d9d2d..bce91ae969 100644
--- a/contracts/staking/Cargo.lock
+++ b/contracts/staking/Cargo.lock
@@ -1687,9 +1687,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78caedecd8cb71ed47ccca03b68d69414a3d278bb031e6f93f15759344efdd52"
+checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1715,9 +1715,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726a8450541af4a57c34af7b6973fdbfc79f896cc7e733429577dfd1d1687180"
+checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1738,9 +1738,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e5633f90f372563ebbdf3f9799c7b29ba11c90e56cf9b54017112d2e656c95"
+checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1757,9 +1757,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d38957de6f452115c0af3ff08cec268ee248d665b54d4bbf7da60b7453cb97"
+checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1776,9 +1776,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97901fdbaae383dbb90ea162cc3a76a9fa58ac39aec7948b4c0b9bbef9307738"
+checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1788,9 +1788,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e028013811035111beb768074b6ccc09eabd77811b1e01fd099b5471924ca16"
+checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1799,9 +1799,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67f1f2839f4f61509550e4ddcd0e658e19f3af862b51c79fda15549d735d659b"
+checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1815,9 +1815,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043118ec4f16d1714fed3aab758b502b864bd865e1d5188626c9ad290100563f"
+checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/virus/Cargo.lock b/contracts/virus/Cargo.lock
index a8c9b9cc37..fa242a80da 100644
--- a/contracts/virus/Cargo.lock
+++ b/contracts/virus/Cargo.lock
@@ -1660,9 +1660,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78caedecd8cb71ed47ccca03b68d69414a3d278bb031e6f93f15759344efdd52"
+checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1688,9 +1688,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726a8450541af4a57c34af7b6973fdbfc79f896cc7e733429577dfd1d1687180"
+checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1711,9 +1711,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e5633f90f372563ebbdf3f9799c7b29ba11c90e56cf9b54017112d2e656c95"
+checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1730,9 +1730,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d38957de6f452115c0af3ff08cec268ee248d665b54d4bbf7da60b7453cb97"
+checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1749,9 +1749,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97901fdbaae383dbb90ea162cc3a76a9fa58ac39aec7948b4c0b9bbef9307738"
+checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1761,9 +1761,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e028013811035111beb768074b6ccc09eabd77811b1e01fd099b5471924ca16"
+checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1772,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67f1f2839f4f61509550e4ddcd0e658e19f3af862b51c79fda15549d735d659b"
+checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1788,9 +1788,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "3.3.0"
+version = "4.0.0-alpha.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043118ec4f16d1714fed3aab758b502b864bd865e1d5188626c9ad290100563f"
+checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
 dependencies = [
  "backtrace",
  "cc",

From 3a64f24256f6de74748a5176878f89b6ca1fec16 Mon Sep 17 00:00:00 2001
From: Christoph Otter <chris@confio.gmbh>
Date: Wed, 31 May 2023 11:41:17 +0200
Subject: [PATCH 03/13] Add unchecked_modules cache option and benchmark

---
 packages/vm/benches/main.rs                  | 41 ++++++++++++++++++++
 packages/vm/src/cache.rs                     | 12 +++++-
 packages/vm/src/modules/file_system_cache.rs | 22 ++++++++---
 3 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/packages/vm/benches/main.rs b/packages/vm/benches/main.rs
index f764394ba7..ce5cf35415 100644
--- a/packages/vm/benches/main.rs
+++ b/packages/vm/benches/main.rs
@@ -126,6 +126,7 @@ fn bench_cache(c: &mut Criterion) {
         available_capabilities: capabilities_from_csv("iterator,staking"),
         memory_cache_size: MEMORY_CACHE_SIZE,
         instance_memory_limit: DEFAULT_MEMORY_LIMIT,
+        unchecked_modules: false,
     };
 
     group.bench_function("save wasm", |b| {
@@ -149,6 +150,21 @@ fn bench_cache(c: &mut Criterion) {
         });
     });
 
+    group.bench_function("load wasm unchecked", |b| {
+        let options = CacheOptions {
+            unchecked_modules: true,
+            ..options.clone()
+        };
+        let cache: Cache<MockApi, MockStorage, MockQuerier> =
+            unsafe { Cache::new(options).unwrap() };
+        let checksum = cache.save_wasm(CONTRACT).unwrap();
+
+        b.iter(|| {
+            let result = cache.load_wasm(&checksum);
+            assert!(result.is_ok());
+        });
+    });
+
     group.bench_function("analyze", |b| {
         let cache: Cache<MockApi, MockStorage, MockQuerier> =
             unsafe { Cache::new(options.clone()).unwrap() };
@@ -166,6 +182,30 @@ fn bench_cache(c: &mut Criterion) {
             available_capabilities: capabilities_from_csv("iterator,staking"),
             memory_cache_size: Size(0),
             instance_memory_limit: DEFAULT_MEMORY_LIMIT,
+            unchecked_modules: false,
+        };
+        let cache: Cache<MockApi, MockStorage, MockQuerier> =
+            unsafe { Cache::new(non_memcache).unwrap() };
+        let checksum = cache.save_wasm(CONTRACT).unwrap();
+
+        b.iter(|| {
+            let _ = cache
+                .get_instance(&checksum, mock_backend(&[]), DEFAULT_INSTANCE_OPTIONS)
+                .unwrap();
+            assert_eq!(cache.stats().hits_pinned_memory_cache, 0);
+            assert_eq!(cache.stats().hits_memory_cache, 0);
+            assert!(cache.stats().hits_fs_cache >= 1);
+            assert_eq!(cache.stats().misses, 0);
+        });
+    });
+
+    group.bench_function("instantiate from fs unchecked", |b| {
+        let non_memcache = CacheOptions {
+            base_dir: TempDir::new().unwrap().into_path(),
+            available_capabilities: capabilities_from_csv("iterator,staking"),
+            memory_cache_size: Size(0),
+            instance_memory_limit: DEFAULT_MEMORY_LIMIT,
+            unchecked_modules: true,
         };
         let cache: Cache<MockApi, MockStorage, MockQuerier> =
             unsafe { Cache::new(non_memcache).unwrap() };
@@ -232,6 +272,7 @@ pub fn bench_instance_threads(c: &mut Criterion) {
             available_capabilities: capabilities_from_csv("iterator,staking"),
             memory_cache_size: MEMORY_CACHE_SIZE,
             instance_memory_limit: DEFAULT_MEMORY_LIMIT,
+            unchecked_modules: false,
         };
 
         let cache: Cache<MockApi, MockStorage, MockQuerier> =
diff --git a/packages/vm/src/cache.rs b/packages/vm/src/cache.rs
index 019e4e72a7..e76e92759d 100644
--- a/packages/vm/src/cache.rs
+++ b/packages/vm/src/cache.rs
@@ -59,6 +59,9 @@ pub struct CacheOptions {
     pub base_dir: PathBuf,
     pub available_capabilities: HashSet<String>,
     pub memory_cache_size: Size,
+    /// If true, the filesystem cache will use the `*_unchecked` wasmer functions for loading
+    /// modules from disk.
+    pub unchecked_modules: bool,
     /// Memory limit for instances, in bytes. Use a value that is divisible by the Wasm page size 65536,
     /// e.g. full MiBs.
     pub instance_memory_limit: Size,
@@ -114,6 +117,7 @@ where
             available_capabilities,
             memory_cache_size,
             instance_memory_limit,
+            unchecked_modules,
         } = options;
 
         let state_path = base_dir.join(STATE_DIR);
@@ -126,7 +130,7 @@ where
         mkdir_p(&cache_path).map_err(|_e| VmError::cache_err("Error creating cache directory"))?;
         mkdir_p(&wasm_path).map_err(|_e| VmError::cache_err("Error creating wasm directory"))?;
 
-        let fs_cache = FileSystemCache::new(cache_path.join(MODULES_DIR))
+        let fs_cache = FileSystemCache::new(cache_path.join(MODULES_DIR), unchecked_modules)
             .map_err(|e| VmError::cache_err(format!("Error file system cache: {}", e)))?;
         Ok(Cache {
             available_capabilities,
@@ -493,6 +497,7 @@ mod tests {
             available_capabilities: default_capabilities(),
             memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
             instance_memory_limit: TESTING_MEMORY_LIMIT,
+            unchecked_modules: false,
         }
     }
 
@@ -504,6 +509,7 @@ mod tests {
             available_capabilities: capabilities,
             memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
             instance_memory_limit: TESTING_MEMORY_LIMIT,
+            unchecked_modules: false,
         }
     }
 
@@ -608,6 +614,7 @@ mod tests {
                 available_capabilities: default_capabilities(),
                 memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
                 instance_memory_limit: TESTING_MEMORY_LIMIT,
+                unchecked_modules: false,
             };
             let cache1: Cache<MockApi, MockStorage, MockQuerier> =
                 unsafe { Cache::new(options1).unwrap() };
@@ -620,6 +627,7 @@ mod tests {
                 available_capabilities: default_capabilities(),
                 memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
                 instance_memory_limit: TESTING_MEMORY_LIMIT,
+                unchecked_modules: false,
             };
             let cache2: Cache<MockApi, MockStorage, MockQuerier> =
                 unsafe { Cache::new(options2).unwrap() };
@@ -653,6 +661,7 @@ mod tests {
             available_capabilities: default_capabilities(),
             memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
             instance_memory_limit: TESTING_MEMORY_LIMIT,
+            unchecked_modules: false,
         };
         let cache: Cache<MockApi, MockStorage, MockQuerier> =
             unsafe { Cache::new(options).unwrap() };
@@ -1236,6 +1245,7 @@ mod tests {
             available_capabilities: default_capabilities(),
             memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
             instance_memory_limit: TESTING_MEMORY_LIMIT,
+            unchecked_modules: false,
         };
         let cache: Cache<MockApi, MockStorage, MockQuerier> =
             unsafe { Cache::new(options).unwrap() };
diff --git a/packages/vm/src/modules/file_system_cache.rs b/packages/vm/src/modules/file_system_cache.rs
index dd94b58341..8773ca11f8 100644
--- a/packages/vm/src/modules/file_system_cache.rs
+++ b/packages/vm/src/modules/file_system_cache.rs
@@ -50,6 +50,8 @@ const MODULE_SERIALIZATION_VERSION: &str = "v5";
 /// Representation of a directory that contains compiled Wasm artifacts.
 pub struct FileSystemCache {
     modules_path: PathBuf,
+    /// If true, the cache uses the `*_unchecked` wasmer functions for loading modules from disk.
+    unchecked_modules: bool,
 }
 
 /// An error type that hides system specific error information
@@ -69,12 +71,17 @@ pub enum NewFileSystemCacheError {
 impl FileSystemCache {
     /// Construct a new `FileSystemCache` around the specified directory.
     /// The contents of the cache are stored in sub-versioned directories.
+    /// If `unchecked_modules` is set to true, it uses the `*_unchecked`
+    /// wasmer functions for loading modules from disk (no validity checks).
     ///
     /// # Safety
     ///
     /// This method is unsafe because there's no way to ensure the artifacts
     /// stored in this cache haven't been corrupted or tampered with.
-    pub unsafe fn new(base_path: impl Into<PathBuf>) -> Result<Self, NewFileSystemCacheError> {
+    pub unsafe fn new(
+        base_path: impl Into<PathBuf>,
+        unchecked_modules: bool,
+    ) -> Result<Self, NewFileSystemCacheError> {
         let base_path: PathBuf = base_path.into();
         if base_path.exists() {
             let metadata = base_path
@@ -97,6 +104,7 @@ impl FileSystemCache {
                 current_wasmer_module_version(),
                 &Target::default(),
             ),
+            unchecked_modules,
         })
     }
 
@@ -110,7 +118,11 @@ impl FileSystemCache {
         let filename = checksum.to_hex();
         let file_path = self.modules_path.join(filename);
 
-        let result = unsafe { Module::deserialize_from_file_unchecked(engine, &file_path) };
+        let result = if self.unchecked_modules {
+            unsafe { Module::deserialize_from_file_unchecked(engine, &file_path) }
+        } else {
+            unsafe { Module::deserialize_from_file(engine, &file_path) }
+        };
         match result {
             Ok(module) => {
                 let module_size = module_size(&file_path)?;
@@ -218,7 +230,7 @@ mod tests {
     #[test]
     fn file_system_cache_run() {
         let tmp_dir = TempDir::new().unwrap();
-        let mut cache = unsafe { FileSystemCache::new(tmp_dir.path()).unwrap() };
+        let mut cache = unsafe { FileSystemCache::new(tmp_dir.path(), false).unwrap() };
 
         // Create module
         let wasm = wat::parse_str(SOME_WAT).unwrap();
@@ -255,7 +267,7 @@ mod tests {
     #[test]
     fn file_system_cache_store_uses_expected_path() {
         let tmp_dir = TempDir::new().unwrap();
-        let mut cache = unsafe { FileSystemCache::new(tmp_dir.path()).unwrap() };
+        let mut cache = unsafe { FileSystemCache::new(tmp_dir.path(), false).unwrap() };
 
         // Create module
         let wasm = wat::parse_str(SOME_WAT).unwrap();
@@ -278,7 +290,7 @@ mod tests {
     #[test]
     fn file_system_cache_remove_works() {
         let tmp_dir = TempDir::new().unwrap();
-        let mut cache = unsafe { FileSystemCache::new(tmp_dir.path()).unwrap() };
+        let mut cache = unsafe { FileSystemCache::new(tmp_dir.path(), false).unwrap() };
 
         // Create module
         let wasm = wat::parse_str(SOME_WAT).unwrap();

From eef9ffe1ff5974fade42a6cd01f798cbb34a53a8 Mon Sep 17 00:00:00 2001
From: Christoph Otter <chris@confio.gmbh>
Date: Wed, 31 May 2023 11:58:17 +0200
Subject: [PATCH 04/13] Load modules checked from fs by default

---
 packages/vm/benches/main.rs | 41 -------------------------------------
 packages/vm/src/cache.rs    | 12 +----------
 2 files changed, 1 insertion(+), 52 deletions(-)

diff --git a/packages/vm/benches/main.rs b/packages/vm/benches/main.rs
index ce5cf35415..f764394ba7 100644
--- a/packages/vm/benches/main.rs
+++ b/packages/vm/benches/main.rs
@@ -126,7 +126,6 @@ fn bench_cache(c: &mut Criterion) {
         available_capabilities: capabilities_from_csv("iterator,staking"),
         memory_cache_size: MEMORY_CACHE_SIZE,
         instance_memory_limit: DEFAULT_MEMORY_LIMIT,
-        unchecked_modules: false,
     };
 
     group.bench_function("save wasm", |b| {
@@ -150,21 +149,6 @@ fn bench_cache(c: &mut Criterion) {
         });
     });
 
-    group.bench_function("load wasm unchecked", |b| {
-        let options = CacheOptions {
-            unchecked_modules: true,
-            ..options.clone()
-        };
-        let cache: Cache<MockApi, MockStorage, MockQuerier> =
-            unsafe { Cache::new(options).unwrap() };
-        let checksum = cache.save_wasm(CONTRACT).unwrap();
-
-        b.iter(|| {
-            let result = cache.load_wasm(&checksum);
-            assert!(result.is_ok());
-        });
-    });
-
     group.bench_function("analyze", |b| {
         let cache: Cache<MockApi, MockStorage, MockQuerier> =
             unsafe { Cache::new(options.clone()).unwrap() };
@@ -182,30 +166,6 @@ fn bench_cache(c: &mut Criterion) {
             available_capabilities: capabilities_from_csv("iterator,staking"),
             memory_cache_size: Size(0),
             instance_memory_limit: DEFAULT_MEMORY_LIMIT,
-            unchecked_modules: false,
-        };
-        let cache: Cache<MockApi, MockStorage, MockQuerier> =
-            unsafe { Cache::new(non_memcache).unwrap() };
-        let checksum = cache.save_wasm(CONTRACT).unwrap();
-
-        b.iter(|| {
-            let _ = cache
-                .get_instance(&checksum, mock_backend(&[]), DEFAULT_INSTANCE_OPTIONS)
-                .unwrap();
-            assert_eq!(cache.stats().hits_pinned_memory_cache, 0);
-            assert_eq!(cache.stats().hits_memory_cache, 0);
-            assert!(cache.stats().hits_fs_cache >= 1);
-            assert_eq!(cache.stats().misses, 0);
-        });
-    });
-
-    group.bench_function("instantiate from fs unchecked", |b| {
-        let non_memcache = CacheOptions {
-            base_dir: TempDir::new().unwrap().into_path(),
-            available_capabilities: capabilities_from_csv("iterator,staking"),
-            memory_cache_size: Size(0),
-            instance_memory_limit: DEFAULT_MEMORY_LIMIT,
-            unchecked_modules: true,
         };
         let cache: Cache<MockApi, MockStorage, MockQuerier> =
             unsafe { Cache::new(non_memcache).unwrap() };
@@ -272,7 +232,6 @@ pub fn bench_instance_threads(c: &mut Criterion) {
             available_capabilities: capabilities_from_csv("iterator,staking"),
             memory_cache_size: MEMORY_CACHE_SIZE,
             instance_memory_limit: DEFAULT_MEMORY_LIMIT,
-            unchecked_modules: false,
         };
 
         let cache: Cache<MockApi, MockStorage, MockQuerier> =
diff --git a/packages/vm/src/cache.rs b/packages/vm/src/cache.rs
index e76e92759d..fbf2af6b23 100644
--- a/packages/vm/src/cache.rs
+++ b/packages/vm/src/cache.rs
@@ -59,9 +59,6 @@ pub struct CacheOptions {
     pub base_dir: PathBuf,
     pub available_capabilities: HashSet<String>,
     pub memory_cache_size: Size,
-    /// If true, the filesystem cache will use the `*_unchecked` wasmer functions for loading
-    /// modules from disk.
-    pub unchecked_modules: bool,
     /// Memory limit for instances, in bytes. Use a value that is divisible by the Wasm page size 65536,
     /// e.g. full MiBs.
     pub instance_memory_limit: Size,
@@ -117,7 +114,6 @@ where
             available_capabilities,
             memory_cache_size,
             instance_memory_limit,
-            unchecked_modules,
         } = options;
 
         let state_path = base_dir.join(STATE_DIR);
@@ -130,7 +126,7 @@ where
         mkdir_p(&cache_path).map_err(|_e| VmError::cache_err("Error creating cache directory"))?;
         mkdir_p(&wasm_path).map_err(|_e| VmError::cache_err("Error creating wasm directory"))?;
 
-        let fs_cache = FileSystemCache::new(cache_path.join(MODULES_DIR), unchecked_modules)
+        let fs_cache = FileSystemCache::new(cache_path.join(MODULES_DIR), false)
             .map_err(|e| VmError::cache_err(format!("Error file system cache: {}", e)))?;
         Ok(Cache {
             available_capabilities,
@@ -497,7 +493,6 @@ mod tests {
             available_capabilities: default_capabilities(),
             memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
             instance_memory_limit: TESTING_MEMORY_LIMIT,
-            unchecked_modules: false,
         }
     }
 
@@ -509,7 +504,6 @@ mod tests {
             available_capabilities: capabilities,
             memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
             instance_memory_limit: TESTING_MEMORY_LIMIT,
-            unchecked_modules: false,
         }
     }
 
@@ -614,7 +608,6 @@ mod tests {
                 available_capabilities: default_capabilities(),
                 memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
                 instance_memory_limit: TESTING_MEMORY_LIMIT,
-                unchecked_modules: false,
             };
             let cache1: Cache<MockApi, MockStorage, MockQuerier> =
                 unsafe { Cache::new(options1).unwrap() };
@@ -627,7 +620,6 @@ mod tests {
                 available_capabilities: default_capabilities(),
                 memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
                 instance_memory_limit: TESTING_MEMORY_LIMIT,
-                unchecked_modules: false,
             };
             let cache2: Cache<MockApi, MockStorage, MockQuerier> =
                 unsafe { Cache::new(options2).unwrap() };
@@ -661,7 +653,6 @@ mod tests {
             available_capabilities: default_capabilities(),
             memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
             instance_memory_limit: TESTING_MEMORY_LIMIT,
-            unchecked_modules: false,
         };
         let cache: Cache<MockApi, MockStorage, MockQuerier> =
             unsafe { Cache::new(options).unwrap() };
@@ -1245,7 +1236,6 @@ mod tests {
             available_capabilities: default_capabilities(),
             memory_cache_size: TESTING_MEMORY_CACHE_SIZE,
             instance_memory_limit: TESTING_MEMORY_LIMIT,
-            unchecked_modules: false,
         };
         let cache: Cache<MockApi, MockStorage, MockQuerier> =
             unsafe { Cache::new(options).unwrap() };

From 73fa31ac4354d4d25f127445c377c15e6332d8a8 Mon Sep 17 00:00:00 2001
From: Christoph Otter <chris@confio.gmbh>
Date: Thu, 1 Jun 2023 10:22:06 +0200
Subject: [PATCH 05/13] Add fn to use unchecked loading from fs cache

---
 packages/vm/benches/main.rs                  | 36 ++++++++++++++++++++
 packages/vm/src/cache.rs                     | 10 ++++++
 packages/vm/src/modules/file_system_cache.rs |  6 ++++
 3 files changed, 52 insertions(+)

diff --git a/packages/vm/benches/main.rs b/packages/vm/benches/main.rs
index f764394ba7..59f46c6836 100644
--- a/packages/vm/benches/main.rs
+++ b/packages/vm/benches/main.rs
@@ -149,6 +149,19 @@ fn bench_cache(c: &mut Criterion) {
         });
     });
 
+    group.bench_function("load wasm unchecked", |b| {
+        let options = CacheOptions { ..options.clone() };
+        let mut cache: Cache<MockApi, MockStorage, MockQuerier> =
+            unsafe { Cache::new(options).unwrap() };
+        cache.set_module_unchecked(true);
+        let checksum = cache.save_wasm(CONTRACT).unwrap();
+
+        b.iter(|| {
+            let result = cache.load_wasm(&checksum);
+            assert!(result.is_ok());
+        });
+    });
+
     group.bench_function("analyze", |b| {
         let cache: Cache<MockApi, MockStorage, MockQuerier> =
             unsafe { Cache::new(options.clone()).unwrap() };
@@ -182,6 +195,29 @@ fn bench_cache(c: &mut Criterion) {
         });
     });
 
+    group.bench_function("instantiate from fs unchecked", |b| {
+        let non_memcache = CacheOptions {
+            base_dir: TempDir::new().unwrap().into_path(),
+            available_capabilities: capabilities_from_csv("iterator,staking"),
+            memory_cache_size: Size(0),
+            instance_memory_limit: DEFAULT_MEMORY_LIMIT,
+        };
+        let mut cache: Cache<MockApi, MockStorage, MockQuerier> =
+            unsafe { Cache::new(non_memcache).unwrap() };
+        cache.set_module_unchecked(true);
+        let checksum = cache.save_wasm(CONTRACT).unwrap();
+
+        b.iter(|| {
+            let _ = cache
+                .get_instance(&checksum, mock_backend(&[]), DEFAULT_INSTANCE_OPTIONS)
+                .unwrap();
+            assert_eq!(cache.stats().hits_pinned_memory_cache, 0);
+            assert_eq!(cache.stats().hits_memory_cache, 0);
+            assert!(cache.stats().hits_fs_cache >= 1);
+            assert_eq!(cache.stats().misses, 0);
+        });
+    });
+
     group.bench_function("instantiate from memory", |b| {
         let checksum = Checksum::generate(CONTRACT);
         let cache: Cache<MockApi, MockStorage, MockQuerier> =
diff --git a/packages/vm/src/cache.rs b/packages/vm/src/cache.rs
index fbf2af6b23..1a1117ffc9 100644
--- a/packages/vm/src/cache.rs
+++ b/packages/vm/src/cache.rs
@@ -145,6 +145,16 @@ where
         })
     }
 
+    /// If `unchecked` is true, the filesystem cache will use the `*_unchecked` wasmer functions for
+    /// loading modules from disk.
+    pub fn set_module_unchecked(&mut self, unchecked: bool) {
+        self.inner
+            .lock()
+            .unwrap()
+            .fs_cache
+            .set_module_unchecked(unchecked);
+    }
+
     pub fn stats(&self) -> Stats {
         self.inner.lock().unwrap().stats
     }
diff --git a/packages/vm/src/modules/file_system_cache.rs b/packages/vm/src/modules/file_system_cache.rs
index 8773ca11f8..aef4be3ec8 100644
--- a/packages/vm/src/modules/file_system_cache.rs
+++ b/packages/vm/src/modules/file_system_cache.rs
@@ -108,6 +108,12 @@ impl FileSystemCache {
         })
     }
 
+    /// If `unchecked` is true, the cache will use the `*_unchecked` wasmer functions for
+    /// loading modules from disk.
+    pub fn set_module_unchecked(&mut self, unchecked: bool) {
+        self.unchecked_modules = unchecked;
+    }
+
     /// Loads a serialized module from the file system and returns a module (i.e. artifact + store),
     /// along with the size of the serialized module.
     pub fn load(

From ecbaf9e2c10a4419e25f2b6ed3cd84bd80aa36d2 Mon Sep 17 00:00:00 2001
From: Christoph Otter <chris@confio.gmbh>
Date: Mon, 19 Jun 2023 14:00:25 +0200
Subject: [PATCH 06/13] Update wasmer version

---
 Cargo.lock                            | 32 +++++++++++++--------------
 contracts/burner/Cargo.lock           | 32 +++++++++++++--------------
 contracts/crypto-verify/Cargo.lock    | 32 +++++++++++++--------------
 contracts/cyberpunk/Cargo.lock        | 32 +++++++++++++--------------
 contracts/floaty/Cargo.lock           | 32 +++++++++++++--------------
 contracts/hackatom/Cargo.lock         | 32 +++++++++++++--------------
 contracts/ibc-reflect-send/Cargo.lock | 32 +++++++++++++--------------
 contracts/ibc-reflect/Cargo.lock      | 32 +++++++++++++--------------
 contracts/queue/Cargo.lock            | 32 +++++++++++++--------------
 contracts/reflect/Cargo.lock          | 32 +++++++++++++--------------
 contracts/staking/Cargo.lock          | 32 +++++++++++++--------------
 contracts/virus/Cargo.lock            | 32 +++++++++++++--------------
 packages/vm/Cargo.toml                |  4 ++--
 13 files changed, 194 insertions(+), 194 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 29e803e520..ab264acdaa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2356,9 +2356,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
+checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -2384,9 +2384,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
+checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -2407,9 +2407,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
+checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -2426,9 +2426,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
+checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -2445,9 +2445,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
+checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -2457,9 +2457,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
+checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -2468,9 +2468,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
+checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -2484,9 +2484,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
+checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/burner/Cargo.lock b/contracts/burner/Cargo.lock
index 55521aa7af..c12378344c 100644
--- a/contracts/burner/Cargo.lock
+++ b/contracts/burner/Cargo.lock
@@ -1659,9 +1659,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
+checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1687,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
+checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1710,9 +1710,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
+checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1729,9 +1729,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
+checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1748,9 +1748,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
+checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1760,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
+checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1771,9 +1771,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
+checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1787,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
+checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/crypto-verify/Cargo.lock b/contracts/crypto-verify/Cargo.lock
index df789125a7..3bf1fea3ec 100644
--- a/contracts/crypto-verify/Cargo.lock
+++ b/contracts/crypto-verify/Cargo.lock
@@ -1702,9 +1702,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
+checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1730,9 +1730,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
+checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1753,9 +1753,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
+checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1772,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
+checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1791,9 +1791,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
+checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1803,9 +1803,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
+checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1814,9 +1814,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
+checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1830,9 +1830,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
+checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/cyberpunk/Cargo.lock b/contracts/cyberpunk/Cargo.lock
index 377691eeb5..42613edb50 100644
--- a/contracts/cyberpunk/Cargo.lock
+++ b/contracts/cyberpunk/Cargo.lock
@@ -1799,9 +1799,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
+checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1827,9 +1827,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
+checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1850,9 +1850,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
+checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1869,9 +1869,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
+checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1888,9 +1888,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
+checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1900,9 +1900,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
+checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1911,9 +1911,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
+checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1927,9 +1927,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
+checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/floaty/Cargo.lock b/contracts/floaty/Cargo.lock
index 4340d4df12..74346659d2 100644
--- a/contracts/floaty/Cargo.lock
+++ b/contracts/floaty/Cargo.lock
@@ -1660,9 +1660,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
+checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1688,9 +1688,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
+checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1711,9 +1711,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
+checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1730,9 +1730,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
+checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1749,9 +1749,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
+checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1761,9 +1761,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
+checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1772,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
+checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1788,9 +1788,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
+checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/hackatom/Cargo.lock b/contracts/hackatom/Cargo.lock
index 6ad4ef2f67..28d2ed6585 100644
--- a/contracts/hackatom/Cargo.lock
+++ b/contracts/hackatom/Cargo.lock
@@ -1661,9 +1661,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
+checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1689,9 +1689,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
+checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1712,9 +1712,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
+checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1731,9 +1731,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
+checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1750,9 +1750,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
+checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1762,9 +1762,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
+checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1773,9 +1773,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
+checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1789,9 +1789,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
+checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/ibc-reflect-send/Cargo.lock b/contracts/ibc-reflect-send/Cargo.lock
index 49144c7c5c..c7c05a55a0 100644
--- a/contracts/ibc-reflect-send/Cargo.lock
+++ b/contracts/ibc-reflect-send/Cargo.lock
@@ -1659,9 +1659,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
+checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1687,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
+checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1710,9 +1710,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
+checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1729,9 +1729,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
+checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1748,9 +1748,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
+checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1760,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
+checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1771,9 +1771,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
+checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1787,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
+checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/ibc-reflect/Cargo.lock b/contracts/ibc-reflect/Cargo.lock
index 65c2688e4b..8db592b491 100644
--- a/contracts/ibc-reflect/Cargo.lock
+++ b/contracts/ibc-reflect/Cargo.lock
@@ -1659,9 +1659,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
+checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1687,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
+checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1710,9 +1710,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
+checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1729,9 +1729,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
+checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1748,9 +1748,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
+checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1760,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
+checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1771,9 +1771,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
+checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1787,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
+checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/queue/Cargo.lock b/contracts/queue/Cargo.lock
index d64af50363..8723319a3a 100644
--- a/contracts/queue/Cargo.lock
+++ b/contracts/queue/Cargo.lock
@@ -1659,9 +1659,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
+checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1687,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
+checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1710,9 +1710,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
+checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1729,9 +1729,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
+checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1748,9 +1748,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
+checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1760,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
+checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1771,9 +1771,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
+checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1787,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
+checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/reflect/Cargo.lock b/contracts/reflect/Cargo.lock
index 908d3c2491..1ba8b005c3 100644
--- a/contracts/reflect/Cargo.lock
+++ b/contracts/reflect/Cargo.lock
@@ -1660,9 +1660,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
+checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1688,9 +1688,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
+checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1711,9 +1711,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
+checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1730,9 +1730,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
+checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1749,9 +1749,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
+checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1761,9 +1761,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
+checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1772,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
+checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1788,9 +1788,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
+checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/staking/Cargo.lock b/contracts/staking/Cargo.lock
index bce91ae969..1cdad2b4b0 100644
--- a/contracts/staking/Cargo.lock
+++ b/contracts/staking/Cargo.lock
@@ -1687,9 +1687,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
+checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1715,9 +1715,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
+checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1738,9 +1738,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
+checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1757,9 +1757,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
+checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1776,9 +1776,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
+checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1788,9 +1788,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
+checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1799,9 +1799,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
+checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1815,9 +1815,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
+checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/virus/Cargo.lock b/contracts/virus/Cargo.lock
index fa242a80da..96ecd638d5 100644
--- a/contracts/virus/Cargo.lock
+++ b/contracts/virus/Cargo.lock
@@ -1660,9 +1660,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c8fbe9fc5a0f9edcdb625859382d9acddac7c9619a77dd5dff3b1f1f9d4609"
+checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1688,9 +1688,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9438969e43529ba78fafdf0495df624e5eca9366881c7452e5ff5037a9d9ffde"
+checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1711,9 +1711,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3bec24e3fe4c2414481c999bac0330d1b1b3c3930c36d21e30b7874ad7a129"
+checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1730,9 +1730,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb98a7bc417b8fd12d40ba22352d3eef1e22b2a050885d853af5b8c73071223"
+checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1749,9 +1749,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb84ebb76c8f298537535aa4cef65e0ca0de69172bc0ca9b6746dc2c1c1d0"
+checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1761,9 +1761,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63565dd5d54ee0fa1d349d07e3cf183b27c978e2b73abd9517ab800fb4781a6c"
+checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1772,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b842f750f53bb118540169c52dad83f2ac00b4e52f49067f9e78d45b53b4ce"
+checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1788,9 +1788,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-alpha.1"
+version = "4.0.0-beta.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0847dca1391c1c6ac31c742f79ac115d0c02a0af421a56cc53c1ceb0430558db"
+checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml
index 90a17b0907..c1deb4f416 100644
--- a/packages/vm/Cargo.toml
+++ b/packages/vm/Cargo.toml
@@ -49,8 +49,8 @@ serde = { version = "1.0.103", default-features = false, features = ["derive", "
 serde_json = "1.0.40"
 sha2 = "0.10.3"
 thiserror = "1.0.26"
-wasmer = { version = "=4.0.0-alpha.1", default-features = false, features = ["cranelift", "singlepass"] }
-wasmer-middlewares = "=4.0.0-alpha.1"
+wasmer = { version = "=4.0.0-beta.3", default-features = false, features = ["cranelift", "singlepass"] }
+wasmer-middlewares = "=4.0.0-beta.3"
 
 # Dependencies that we do not use ourself. We add those entries
 # to bump the min version of them.

From a42a5e04326893745c570bb87eb237e2438b2355 Mon Sep 17 00:00:00 2001
From: Christoph Otter <chris@confio.gmbh>
Date: Mon, 26 Jun 2023 15:23:48 +0200
Subject: [PATCH 07/13] Use stable wasmer 4

---
 Cargo.lock                            | 32 +++++++++++++--------------
 contracts/burner/Cargo.lock           | 32 +++++++++++++--------------
 contracts/crypto-verify/Cargo.lock    | 32 +++++++++++++--------------
 contracts/cyberpunk/Cargo.lock        | 32 +++++++++++++--------------
 contracts/floaty/Cargo.lock           | 32 +++++++++++++--------------
 contracts/hackatom/Cargo.lock         | 32 +++++++++++++--------------
 contracts/ibc-reflect-send/Cargo.lock | 32 +++++++++++++--------------
 contracts/ibc-reflect/Cargo.lock      | 32 +++++++++++++--------------
 contracts/queue/Cargo.lock            | 32 +++++++++++++--------------
 contracts/reflect/Cargo.lock          | 32 +++++++++++++--------------
 contracts/staking/Cargo.lock          | 32 +++++++++++++--------------
 contracts/virus/Cargo.lock            | 32 +++++++++++++--------------
 packages/vm/Cargo.toml                |  4 ++--
 13 files changed, 194 insertions(+), 194 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ab264acdaa..81191e1fff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2356,9 +2356,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
+checksum = "ea790bcdfb4e6e9d1e5ddf75b4699aac62b078fcc9f27f44e1748165ceea67bf"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -2384,9 +2384,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
+checksum = "f093937725e242e5529fed27e08ff836c011a9ecc22e6819fb818c2ac6ff5f88"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -2407,9 +2407,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
+checksum = "3b27b1670d27158789ebe14e4da3902c72132174884a1c6a3533ce4fd9dd83db"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -2426,9 +2426,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
+checksum = "02509aaab7e302fc551ff03512807514b379ba32136892e96fcaa5b62a3228de"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -2445,9 +2445,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
+checksum = "13ae8286cba2acb10065a4dac129c7c7f7bcd24acd6538555d96616eea16bc27"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -2457,9 +2457,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
+checksum = "3bc8cafe02112ecf21a7fc1d090ac0f0220a86a8d4f561c24e382a4c2ee4addc"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -2468,9 +2468,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
+checksum = "918d2f0bb5eaa95a80c06be33f21dee92f40f12cd0982da34490d121a99d244b"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -2484,9 +2484,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
+checksum = "a1e000c2cbd4f9805427af5f3b3446574caf89ab3a1e66c2f3579fbde22b072b"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/burner/Cargo.lock b/contracts/burner/Cargo.lock
index c12378344c..b4398eeab9 100644
--- a/contracts/burner/Cargo.lock
+++ b/contracts/burner/Cargo.lock
@@ -1659,9 +1659,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
+checksum = "ea790bcdfb4e6e9d1e5ddf75b4699aac62b078fcc9f27f44e1748165ceea67bf"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1687,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
+checksum = "f093937725e242e5529fed27e08ff836c011a9ecc22e6819fb818c2ac6ff5f88"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1710,9 +1710,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
+checksum = "3b27b1670d27158789ebe14e4da3902c72132174884a1c6a3533ce4fd9dd83db"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1729,9 +1729,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
+checksum = "02509aaab7e302fc551ff03512807514b379ba32136892e96fcaa5b62a3228de"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1748,9 +1748,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
+checksum = "13ae8286cba2acb10065a4dac129c7c7f7bcd24acd6538555d96616eea16bc27"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1760,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
+checksum = "3bc8cafe02112ecf21a7fc1d090ac0f0220a86a8d4f561c24e382a4c2ee4addc"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1771,9 +1771,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
+checksum = "918d2f0bb5eaa95a80c06be33f21dee92f40f12cd0982da34490d121a99d244b"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1787,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
+checksum = "a1e000c2cbd4f9805427af5f3b3446574caf89ab3a1e66c2f3579fbde22b072b"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/crypto-verify/Cargo.lock b/contracts/crypto-verify/Cargo.lock
index 3bf1fea3ec..8830044d6c 100644
--- a/contracts/crypto-verify/Cargo.lock
+++ b/contracts/crypto-verify/Cargo.lock
@@ -1702,9 +1702,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
+checksum = "ea790bcdfb4e6e9d1e5ddf75b4699aac62b078fcc9f27f44e1748165ceea67bf"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1730,9 +1730,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
+checksum = "f093937725e242e5529fed27e08ff836c011a9ecc22e6819fb818c2ac6ff5f88"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1753,9 +1753,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
+checksum = "3b27b1670d27158789ebe14e4da3902c72132174884a1c6a3533ce4fd9dd83db"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1772,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
+checksum = "02509aaab7e302fc551ff03512807514b379ba32136892e96fcaa5b62a3228de"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1791,9 +1791,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
+checksum = "13ae8286cba2acb10065a4dac129c7c7f7bcd24acd6538555d96616eea16bc27"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1803,9 +1803,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
+checksum = "3bc8cafe02112ecf21a7fc1d090ac0f0220a86a8d4f561c24e382a4c2ee4addc"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1814,9 +1814,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
+checksum = "918d2f0bb5eaa95a80c06be33f21dee92f40f12cd0982da34490d121a99d244b"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1830,9 +1830,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
+checksum = "a1e000c2cbd4f9805427af5f3b3446574caf89ab3a1e66c2f3579fbde22b072b"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/cyberpunk/Cargo.lock b/contracts/cyberpunk/Cargo.lock
index 42613edb50..acf7eb5ad8 100644
--- a/contracts/cyberpunk/Cargo.lock
+++ b/contracts/cyberpunk/Cargo.lock
@@ -1799,9 +1799,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
+checksum = "ea790bcdfb4e6e9d1e5ddf75b4699aac62b078fcc9f27f44e1748165ceea67bf"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1827,9 +1827,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
+checksum = "f093937725e242e5529fed27e08ff836c011a9ecc22e6819fb818c2ac6ff5f88"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1850,9 +1850,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
+checksum = "3b27b1670d27158789ebe14e4da3902c72132174884a1c6a3533ce4fd9dd83db"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1869,9 +1869,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
+checksum = "02509aaab7e302fc551ff03512807514b379ba32136892e96fcaa5b62a3228de"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1888,9 +1888,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
+checksum = "13ae8286cba2acb10065a4dac129c7c7f7bcd24acd6538555d96616eea16bc27"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1900,9 +1900,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
+checksum = "3bc8cafe02112ecf21a7fc1d090ac0f0220a86a8d4f561c24e382a4c2ee4addc"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1911,9 +1911,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
+checksum = "918d2f0bb5eaa95a80c06be33f21dee92f40f12cd0982da34490d121a99d244b"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1927,9 +1927,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
+checksum = "a1e000c2cbd4f9805427af5f3b3446574caf89ab3a1e66c2f3579fbde22b072b"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/floaty/Cargo.lock b/contracts/floaty/Cargo.lock
index 74346659d2..00d8db842e 100644
--- a/contracts/floaty/Cargo.lock
+++ b/contracts/floaty/Cargo.lock
@@ -1660,9 +1660,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
+checksum = "ea790bcdfb4e6e9d1e5ddf75b4699aac62b078fcc9f27f44e1748165ceea67bf"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1688,9 +1688,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
+checksum = "f093937725e242e5529fed27e08ff836c011a9ecc22e6819fb818c2ac6ff5f88"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1711,9 +1711,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
+checksum = "3b27b1670d27158789ebe14e4da3902c72132174884a1c6a3533ce4fd9dd83db"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1730,9 +1730,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
+checksum = "02509aaab7e302fc551ff03512807514b379ba32136892e96fcaa5b62a3228de"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1749,9 +1749,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
+checksum = "13ae8286cba2acb10065a4dac129c7c7f7bcd24acd6538555d96616eea16bc27"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1761,9 +1761,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
+checksum = "3bc8cafe02112ecf21a7fc1d090ac0f0220a86a8d4f561c24e382a4c2ee4addc"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1772,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
+checksum = "918d2f0bb5eaa95a80c06be33f21dee92f40f12cd0982da34490d121a99d244b"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1788,9 +1788,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
+checksum = "a1e000c2cbd4f9805427af5f3b3446574caf89ab3a1e66c2f3579fbde22b072b"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/hackatom/Cargo.lock b/contracts/hackatom/Cargo.lock
index 28d2ed6585..266b9315bd 100644
--- a/contracts/hackatom/Cargo.lock
+++ b/contracts/hackatom/Cargo.lock
@@ -1661,9 +1661,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
+checksum = "ea790bcdfb4e6e9d1e5ddf75b4699aac62b078fcc9f27f44e1748165ceea67bf"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1689,9 +1689,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
+checksum = "f093937725e242e5529fed27e08ff836c011a9ecc22e6819fb818c2ac6ff5f88"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1712,9 +1712,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
+checksum = "3b27b1670d27158789ebe14e4da3902c72132174884a1c6a3533ce4fd9dd83db"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1731,9 +1731,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
+checksum = "02509aaab7e302fc551ff03512807514b379ba32136892e96fcaa5b62a3228de"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1750,9 +1750,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
+checksum = "13ae8286cba2acb10065a4dac129c7c7f7bcd24acd6538555d96616eea16bc27"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1762,9 +1762,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
+checksum = "3bc8cafe02112ecf21a7fc1d090ac0f0220a86a8d4f561c24e382a4c2ee4addc"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1773,9 +1773,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
+checksum = "918d2f0bb5eaa95a80c06be33f21dee92f40f12cd0982da34490d121a99d244b"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1789,9 +1789,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
+checksum = "a1e000c2cbd4f9805427af5f3b3446574caf89ab3a1e66c2f3579fbde22b072b"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/ibc-reflect-send/Cargo.lock b/contracts/ibc-reflect-send/Cargo.lock
index c7c05a55a0..4c187f7720 100644
--- a/contracts/ibc-reflect-send/Cargo.lock
+++ b/contracts/ibc-reflect-send/Cargo.lock
@@ -1659,9 +1659,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
+checksum = "ea790bcdfb4e6e9d1e5ddf75b4699aac62b078fcc9f27f44e1748165ceea67bf"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1687,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
+checksum = "f093937725e242e5529fed27e08ff836c011a9ecc22e6819fb818c2ac6ff5f88"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1710,9 +1710,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
+checksum = "3b27b1670d27158789ebe14e4da3902c72132174884a1c6a3533ce4fd9dd83db"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1729,9 +1729,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
+checksum = "02509aaab7e302fc551ff03512807514b379ba32136892e96fcaa5b62a3228de"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1748,9 +1748,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
+checksum = "13ae8286cba2acb10065a4dac129c7c7f7bcd24acd6538555d96616eea16bc27"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1760,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
+checksum = "3bc8cafe02112ecf21a7fc1d090ac0f0220a86a8d4f561c24e382a4c2ee4addc"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1771,9 +1771,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
+checksum = "918d2f0bb5eaa95a80c06be33f21dee92f40f12cd0982da34490d121a99d244b"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1787,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
+checksum = "a1e000c2cbd4f9805427af5f3b3446574caf89ab3a1e66c2f3579fbde22b072b"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/ibc-reflect/Cargo.lock b/contracts/ibc-reflect/Cargo.lock
index 8db592b491..97100109ea 100644
--- a/contracts/ibc-reflect/Cargo.lock
+++ b/contracts/ibc-reflect/Cargo.lock
@@ -1659,9 +1659,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
+checksum = "ea790bcdfb4e6e9d1e5ddf75b4699aac62b078fcc9f27f44e1748165ceea67bf"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1687,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
+checksum = "f093937725e242e5529fed27e08ff836c011a9ecc22e6819fb818c2ac6ff5f88"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1710,9 +1710,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
+checksum = "3b27b1670d27158789ebe14e4da3902c72132174884a1c6a3533ce4fd9dd83db"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1729,9 +1729,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
+checksum = "02509aaab7e302fc551ff03512807514b379ba32136892e96fcaa5b62a3228de"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1748,9 +1748,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
+checksum = "13ae8286cba2acb10065a4dac129c7c7f7bcd24acd6538555d96616eea16bc27"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1760,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
+checksum = "3bc8cafe02112ecf21a7fc1d090ac0f0220a86a8d4f561c24e382a4c2ee4addc"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1771,9 +1771,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
+checksum = "918d2f0bb5eaa95a80c06be33f21dee92f40f12cd0982da34490d121a99d244b"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1787,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
+checksum = "a1e000c2cbd4f9805427af5f3b3446574caf89ab3a1e66c2f3579fbde22b072b"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/queue/Cargo.lock b/contracts/queue/Cargo.lock
index 8723319a3a..030268b6a2 100644
--- a/contracts/queue/Cargo.lock
+++ b/contracts/queue/Cargo.lock
@@ -1659,9 +1659,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
+checksum = "ea790bcdfb4e6e9d1e5ddf75b4699aac62b078fcc9f27f44e1748165ceea67bf"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1687,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
+checksum = "f093937725e242e5529fed27e08ff836c011a9ecc22e6819fb818c2ac6ff5f88"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1710,9 +1710,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
+checksum = "3b27b1670d27158789ebe14e4da3902c72132174884a1c6a3533ce4fd9dd83db"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1729,9 +1729,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
+checksum = "02509aaab7e302fc551ff03512807514b379ba32136892e96fcaa5b62a3228de"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1748,9 +1748,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
+checksum = "13ae8286cba2acb10065a4dac129c7c7f7bcd24acd6538555d96616eea16bc27"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1760,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
+checksum = "3bc8cafe02112ecf21a7fc1d090ac0f0220a86a8d4f561c24e382a4c2ee4addc"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1771,9 +1771,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
+checksum = "918d2f0bb5eaa95a80c06be33f21dee92f40f12cd0982da34490d121a99d244b"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1787,9 +1787,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
+checksum = "a1e000c2cbd4f9805427af5f3b3446574caf89ab3a1e66c2f3579fbde22b072b"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/reflect/Cargo.lock b/contracts/reflect/Cargo.lock
index 1ba8b005c3..e5d5e5186e 100644
--- a/contracts/reflect/Cargo.lock
+++ b/contracts/reflect/Cargo.lock
@@ -1660,9 +1660,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
+checksum = "ea790bcdfb4e6e9d1e5ddf75b4699aac62b078fcc9f27f44e1748165ceea67bf"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1688,9 +1688,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
+checksum = "f093937725e242e5529fed27e08ff836c011a9ecc22e6819fb818c2ac6ff5f88"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1711,9 +1711,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
+checksum = "3b27b1670d27158789ebe14e4da3902c72132174884a1c6a3533ce4fd9dd83db"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1730,9 +1730,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
+checksum = "02509aaab7e302fc551ff03512807514b379ba32136892e96fcaa5b62a3228de"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1749,9 +1749,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
+checksum = "13ae8286cba2acb10065a4dac129c7c7f7bcd24acd6538555d96616eea16bc27"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1761,9 +1761,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
+checksum = "3bc8cafe02112ecf21a7fc1d090ac0f0220a86a8d4f561c24e382a4c2ee4addc"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1772,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
+checksum = "918d2f0bb5eaa95a80c06be33f21dee92f40f12cd0982da34490d121a99d244b"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1788,9 +1788,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
+checksum = "a1e000c2cbd4f9805427af5f3b3446574caf89ab3a1e66c2f3579fbde22b072b"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/staking/Cargo.lock b/contracts/staking/Cargo.lock
index 1cdad2b4b0..9677d21968 100644
--- a/contracts/staking/Cargo.lock
+++ b/contracts/staking/Cargo.lock
@@ -1687,9 +1687,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
+checksum = "ea790bcdfb4e6e9d1e5ddf75b4699aac62b078fcc9f27f44e1748165ceea67bf"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1715,9 +1715,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
+checksum = "f093937725e242e5529fed27e08ff836c011a9ecc22e6819fb818c2ac6ff5f88"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1738,9 +1738,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
+checksum = "3b27b1670d27158789ebe14e4da3902c72132174884a1c6a3533ce4fd9dd83db"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1757,9 +1757,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
+checksum = "02509aaab7e302fc551ff03512807514b379ba32136892e96fcaa5b62a3228de"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1776,9 +1776,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
+checksum = "13ae8286cba2acb10065a4dac129c7c7f7bcd24acd6538555d96616eea16bc27"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1788,9 +1788,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
+checksum = "3bc8cafe02112ecf21a7fc1d090ac0f0220a86a8d4f561c24e382a4c2ee4addc"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1799,9 +1799,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
+checksum = "918d2f0bb5eaa95a80c06be33f21dee92f40f12cd0982da34490d121a99d244b"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1815,9 +1815,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
+checksum = "a1e000c2cbd4f9805427af5f3b3446574caf89ab3a1e66c2f3579fbde22b072b"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/contracts/virus/Cargo.lock b/contracts/virus/Cargo.lock
index 96ecd638d5..cbf31b6a61 100644
--- a/contracts/virus/Cargo.lock
+++ b/contracts/virus/Cargo.lock
@@ -1660,9 +1660,9 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "wasmer"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d924829e1d14ca3b0ab2562ef7c958fd61ec3fdc6401fd09f20becf59c1f1d17"
+checksum = "ea790bcdfb4e6e9d1e5ddf75b4699aac62b078fcc9f27f44e1748165ceea67bf"
 dependencies = [
  "bytes",
  "cfg-if",
@@ -1688,9 +1688,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945e8cd172c68cf10fefcd40f9c97bd301ecc9bf0136972bf807474f1b5951de"
+checksum = "f093937725e242e5529fed27e08ff836c011a9ecc22e6819fb818c2ac6ff5f88"
 dependencies = [
  "backtrace",
  "cfg-if",
@@ -1711,9 +1711,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-cranelift"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdce36e48ec8c70e34d150073d6214e52757474bb375c013f2ae0bac85800cce"
+checksum = "3b27b1670d27158789ebe14e4da3902c72132174884a1c6a3533ce4fd9dd83db"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1730,9 +1730,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-compiler-singlepass"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d8415054716a3d79e0d74e6da24795875641247d36cc35c3e46c7bf8291e158"
+checksum = "02509aaab7e302fc551ff03512807514b379ba32136892e96fcaa5b62a3228de"
 dependencies = [
  "byteorder",
  "dynasm",
@@ -1749,9 +1749,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-derive"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90277df86705920fefed23c2724ed652fa974af788f0983ca0493b51691a76bd"
+checksum = "13ae8286cba2acb10065a4dac129c7c7f7bcd24acd6538555d96616eea16bc27"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1761,9 +1761,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-middlewares"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271ed9590613a04310efa4c7dbb9c1c7891a059e081af857cbefe6351341a5c5"
+checksum = "3bc8cafe02112ecf21a7fc1d090ac0f0220a86a8d4f561c24e382a4c2ee4addc"
 dependencies = [
  "wasmer",
  "wasmer-types",
@@ -1772,9 +1772,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-types"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "918344b93266cf4efe56e6cd23f35c7325275524f534678145f7ead4b2b8c762"
+checksum = "918d2f0bb5eaa95a80c06be33f21dee92f40f12cd0982da34490d121a99d244b"
 dependencies = [
  "bytecheck",
  "enum-iterator",
@@ -1788,9 +1788,9 @@ dependencies = [
 
 [[package]]
 name = "wasmer-vm"
-version = "4.0.0-beta.3"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e36cba570e0b2662ff52d40fe9a48fd368f6eb35183a84ce43f79bc51b9fd15"
+checksum = "a1e000c2cbd4f9805427af5f3b3446574caf89ab3a1e66c2f3579fbde22b072b"
 dependencies = [
  "backtrace",
  "cc",
diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml
index c1deb4f416..3c36b5b33b 100644
--- a/packages/vm/Cargo.toml
+++ b/packages/vm/Cargo.toml
@@ -49,8 +49,8 @@ serde = { version = "1.0.103", default-features = false, features = ["derive", "
 serde_json = "1.0.40"
 sha2 = "0.10.3"
 thiserror = "1.0.26"
-wasmer = { version = "=4.0.0-beta.3", default-features = false, features = ["cranelift", "singlepass"] }
-wasmer-middlewares = "=4.0.0-beta.3"
+wasmer = { version = "=4.0.0", default-features = false, features = ["cranelift", "singlepass"] }
+wasmer-middlewares = "=4.0.0"
 
 # Dependencies that we do not use ourself. We add those entries
 # to bump the min version of them.

From 0c7cbd128a7fa9d3472c374cd47b9f4f20a674b0 Mon Sep 17 00:00:00 2001
From: Christoph Otter <chris@confio.gmbh>
Date: Mon, 26 Jun 2023 15:28:27 +0200
Subject: [PATCH 08/13] Update ci's rust version

---
 .circleci/config.yml     | 150 +++++++++++++++++++--------------------
 .github/workflows/ci.yml |   2 +-
 2 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 60bd628780..e50be631dd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,7 +72,7 @@ workflows:
           matrix:
             parameters:
               # Run with MSRV and some modern stable Rust
-              rust-version: ["1.64.0", "1.68.2"]
+              rust-version: ["1.67.0", "1.68.2"]
       - benchmarking:
           requires:
             - package_vm
@@ -118,7 +118,7 @@ jobs:
           command: |
             wget https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-gnu/rustup-init
             chmod +x rustup-init
-            ./rustup-init -y --default-toolchain 1.64.0 --profile minimal
+            ./rustup-init -y --default-toolchain 1.67.0 --profile minimal
       - run:
           name: Version information
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
@@ -127,12 +127,12 @@ jobs:
           command: rustup target add wasm32-unknown-unknown && rustup target list --installed
       - restore_cache:
           keys:
-            - v4-arm64-workspace-rust:1.64.0-{{ checksum "Cargo.lock" }}
-            - v4-arm64-workspace-rust:1.64.0-
+            - v4-arm64-workspace-rust:1.67.0-{{ checksum "Cargo.lock" }}
+            - v4-arm64-workspace-rust:1.67.0-
       - restore_cache:
           keys:
-            - v4-arm64-contracts-rust:1.64.0-{{ checksum "contracts/crypto-verify/Cargo.lock" }}-{{ checksum "contracts/hackatom/Cargo.lock" }}-{{ checksum "contracts/queue/Cargo.lock" }}-{{ checksum "contracts/reflect/Cargo.lock" }}-{{ checksum "contracts/staking/Cargo.lock" }}
-            - v4-arm64-contracts-rust:1.64.0-
+            - v4-arm64-contracts-rust:1.67.0-{{ checksum "contracts/crypto-verify/Cargo.lock" }}-{{ checksum "contracts/hackatom/Cargo.lock" }}-{{ checksum "contracts/queue/Cargo.lock" }}-{{ checksum "contracts/reflect/Cargo.lock" }}-{{ checksum "contracts/staking/Cargo.lock" }}
+            - v4-arm64-contracts-rust:1.67.0-
       # Test a few contracts that do something potentially interesting in the VM
       # to test contract execution on ARM64.
       # No need to add all contracts here.
@@ -170,14 +170,14 @@ jobs:
           # use all features
           command: cargo test --locked --features iterator,staking,stargate
       - save_cache:
-          key: v4-arm64-workspace-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: v4-arm64-workspace-rust:1.67.0-{{ checksum "Cargo.lock" }}
           paths:
             - ~/.cargo/registry
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
       - save_cache:
-          key: v4-arm64-contracts-rust:1.64.0-{{ checksum "contracts/crypto-verify/Cargo.lock" }}-{{ checksum "contracts/hackatom/Cargo.lock" }}-{{ checksum "contracts/queue/Cargo.lock" }}-{{ checksum "contracts/reflect/Cargo.lock" }}-{{ checksum "contracts/staking/Cargo.lock" }}
+          key: v4-arm64-contracts-rust:1.67.0-{{ checksum "contracts/crypto-verify/Cargo.lock" }}-{{ checksum "contracts/hackatom/Cargo.lock" }}-{{ checksum "contracts/queue/Cargo.lock" }}-{{ checksum "contracts/reflect/Cargo.lock" }}-{{ checksum "contracts/staking/Cargo.lock" }}
           paths:
             - ~/.cargo/registry
             # crypto-verify
@@ -218,7 +218,7 @@ jobs:
 
   package_crypto:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     steps:
       - checkout
       - run:
@@ -226,7 +226,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-package_crypto-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-package_crypto-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - run:
           name: Build
           working_directory: ~/project/packages/crypto
@@ -241,11 +241,11 @@ jobs:
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
-          key: cargocache-v2-package_crypto-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-package_crypto-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   package_check:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     steps:
       - checkout
       - run:
@@ -253,7 +253,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-package_check-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-package_check-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - run:
           name: Build
           working_directory: ~/project/packages/check
@@ -268,11 +268,11 @@ jobs:
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
-          key: cargocache-v2-package_check-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-package_check-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   package_schema:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     steps:
       - checkout
       - run:
@@ -280,7 +280,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-package_schema-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-package_schema-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - run:
           name: Build
           working_directory: ~/project/packages/schema
@@ -295,11 +295,11 @@ jobs:
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
-          key: cargocache-v2-package_schema-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-package_schema-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   package_schema_derive:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     steps:
       - checkout
       - run:
@@ -307,7 +307,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-package_schema_derive-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-package_schema_derive-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - run:
           name: Build
           working_directory: ~/project/packages/schema-derive
@@ -322,11 +322,11 @@ jobs:
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
-          key: cargocache-v2-package_schema_derive-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-package_schema_derive-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   package_std:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     environment:
       # Limit the number of parallel jobs to avoid OOM crashes during doc testing
       RUST_TEST_THREADS: 8
@@ -337,7 +337,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-package_std-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-package_std-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - run:
           name: Add wasm32 target
           command: rustup target add wasm32-unknown-unknown && rustup target list --installed
@@ -371,11 +371,11 @@ jobs:
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
-          key: cargocache-v2-package_std-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-package_std-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   package_storage:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     steps:
       - checkout
       - run:
@@ -383,7 +383,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-package_storage-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-package_storage-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - run:
           name: Build library for native target
           working_directory: ~/project/packages/storage
@@ -402,11 +402,11 @@ jobs:
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
-          key: cargocache-v2-package_storage-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-package_storage-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   package_vm:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     steps:
       - checkout
       - run:
@@ -414,7 +414,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-package_vm-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-package_vm-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - run:
           name: Build
           working_directory: ~/project/packages/vm
@@ -443,7 +443,7 @@ jobs:
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
-          key: cargocache-v2-package_vm-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-package_vm-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   package_vm_windows:
     executor:
@@ -462,7 +462,7 @@ jobs:
           command: |
             set -o errexit
             curl -sS --output rustup-init.exe https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe
-            ./rustup-init.exe --default-toolchain 1.65.0 -y
+            ./rustup-init.exe --default-toolchain 1.67.0 -y
             echo 'export PATH="$PATH;$USERPROFILE/.cargo/bin"' >> "$BASH_ENV"
       - run:
           name: Version information
@@ -471,7 +471,7 @@ jobs:
             rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cachev3-package_vm_windows-rust:1.65.0-{{ checksum "Cargo.lock" }}
+            - cachev3-package_vm_windows-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - run:
           name: Test
           working_directory: ~/project/packages/vm
@@ -487,11 +487,11 @@ jobs:
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
-          key: cachev3-package_vm_windows-rust:1.65.0-{{ checksum "Cargo.lock" }}
+          key: cachev3-package_vm_windows-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   contract_burner:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     environment:
       RUST_BACKTRACE: 1
     working_directory: ~/cosmwasm/contracts/burner
@@ -503,7 +503,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-v2-contract_burner-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-contract_burner-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - check_contract
       - save_cache:
           paths:
@@ -514,11 +514,11 @@ jobs:
             - target/wasm32-unknown-unknown/release/.fingerprint
             - target/wasm32-unknown-unknown/release/build
             - target/wasm32-unknown-unknown/release/deps
-          key: cargocache-v2-contract_burner-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-contract_burner-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   contract_crypto_verify:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     environment:
       RUST_BACKTRACE: 1
     working_directory: ~/cosmwasm/contracts/crypto-verify
@@ -530,7 +530,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-v2-contract_crypto_verify-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-contract_crypto_verify-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - check_contract
       - save_cache:
           paths:
@@ -541,11 +541,11 @@ jobs:
             - target/wasm32-unknown-unknown/release/.fingerprint
             - target/wasm32-unknown-unknown/release/build
             - target/wasm32-unknown-unknown/release/deps
-          key: cargocache-v2-contract_crypto_verify-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-contract_crypto_verify-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   contract_cyberpunk:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     environment:
       RUST_BACKTRACE: 1
     working_directory: ~/cosmwasm/contracts/cyberpunk
@@ -557,7 +557,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-v2-contract_cyberpunk-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-contract_cyberpunk-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - check_contract
       - save_cache:
           paths:
@@ -568,11 +568,11 @@ jobs:
             - target/wasm32-unknown-unknown/release/.fingerprint
             - target/wasm32-unknown-unknown/release/build
             - target/wasm32-unknown-unknown/release/deps
-          key: cargocache-v2-contract_cyberpunk-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-contract_cyberpunk-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   contract_hackatom:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     environment:
       RUST_BACKTRACE: 1
     working_directory: ~/cosmwasm/contracts/hackatom
@@ -584,7 +584,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-v2-contract_hackatom-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-contract_hackatom-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - check_contract
       - save_cache:
           paths:
@@ -595,11 +595,11 @@ jobs:
             - target/wasm32-unknown-unknown/release/.fingerprint
             - target/wasm32-unknown-unknown/release/build
             - target/wasm32-unknown-unknown/release/deps
-          key: cargocache-v2-contract_hackatom-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-contract_hackatom-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   contract_ibc_reflect:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     environment:
       RUST_BACKTRACE: 1
     working_directory: ~/cosmwasm/contracts/ibc-reflect
@@ -611,7 +611,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-v2-contract_ibc_reflect-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-contract_ibc_reflect-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - check_contract
       - save_cache:
           paths:
@@ -622,11 +622,11 @@ jobs:
             - target/wasm32-unknown-unknown/release/.fingerprint
             - target/wasm32-unknown-unknown/release/build
             - target/wasm32-unknown-unknown/release/deps
-          key: cargocache-v2-contract_ibc_reflect-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-contract_ibc_reflect-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   contract_ibc_reflect_send:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     environment:
       RUST_BACKTRACE: 1
     working_directory: ~/cosmwasm/contracts/ibc-reflect-send
@@ -638,7 +638,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-v2-contract_ibc_reflect_send-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-contract_ibc_reflect_send-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - check_contract
       - save_cache:
           paths:
@@ -649,11 +649,11 @@ jobs:
             - target/wasm32-unknown-unknown/release/.fingerprint
             - target/wasm32-unknown-unknown/release/build
             - target/wasm32-unknown-unknown/release/deps
-          key: cargocache-v2-contract_ibc_reflect_send-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-contract_ibc_reflect_send-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   contract_floaty:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     environment:
       RUST_BACKTRACE: 1
     working_directory: ~/cosmwasm/contracts/floaty
@@ -665,7 +665,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-v2-contract_floaty-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-contract_floaty-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - check_contract
       - save_cache:
           paths:
@@ -676,11 +676,11 @@ jobs:
             - target/wasm32-unknown-unknown/release/.fingerprint
             - target/wasm32-unknown-unknown/release/build
             - target/wasm32-unknown-unknown/release/deps
-          key: cargocache-v2-contract_floaty-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-contract_floaty-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   contract_queue:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     environment:
       RUST_BACKTRACE: 1
     working_directory: ~/cosmwasm/contracts/queue
@@ -692,7 +692,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-v2-contract_queue-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-contract_queue-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - check_contract
       - save_cache:
           paths:
@@ -703,11 +703,11 @@ jobs:
             - target/wasm32-unknown-unknown/release/.fingerprint
             - target/wasm32-unknown-unknown/release/build
             - target/wasm32-unknown-unknown/release/deps
-          key: cargocache-v2-contract_queue-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-contract_queue-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   contract_reflect:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     environment:
       RUST_BACKTRACE: 1
     working_directory: ~/cosmwasm/contracts/reflect
@@ -719,7 +719,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-v2-contract_reflect-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-contract_reflect-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - check_contract
       - save_cache:
           paths:
@@ -730,11 +730,11 @@ jobs:
             - target/wasm32-unknown-unknown/release/.fingerprint
             - target/wasm32-unknown-unknown/release/build
             - target/wasm32-unknown-unknown/release/deps
-          key: cargocache-v2-contract_reflect-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-contract_reflect-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   contract_staking:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     environment:
       RUST_BACKTRACE: 1
     working_directory: ~/cosmwasm/contracts/staking
@@ -746,7 +746,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-v2-contract_staking-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-contract_staking-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - check_contract
       - save_cache:
           paths:
@@ -757,11 +757,11 @@ jobs:
             - target/wasm32-unknown-unknown/release/.fingerprint
             - target/wasm32-unknown-unknown/release/build
             - target/wasm32-unknown-unknown/release/deps
-          key: cargocache-v2-contract_staking-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-contract_staking-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   contract_virus:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     environment:
       RUST_BACKTRACE: 1
     working_directory: ~/cosmwasm/contracts/virus
@@ -773,7 +773,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-v2-contract_virus-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-contract_virus-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - check_contract
       - save_cache:
           paths:
@@ -784,11 +784,11 @@ jobs:
             - target/wasm32-unknown-unknown/release/.fingerprint
             - target/wasm32-unknown-unknown/release/build
             - target/wasm32-unknown-unknown/release/deps
-          key: cargocache-v2-contract_virus-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-contract_virus-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   fmt:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     steps:
       - checkout
       - run:
@@ -796,7 +796,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-fmt-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-fmt-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - run:
           name: Add rustfmt component
           command: rustup component add rustfmt
@@ -809,7 +809,7 @@ jobs:
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
-          key: cargocache-v2-fmt-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-fmt-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   fmt_extra:
     docker:
@@ -831,7 +831,7 @@ jobs:
 
   deadlinks:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     steps:
       - checkout
       - run:
@@ -839,7 +839,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version; rustup target list --installed
       - restore_cache:
           keys:
-            - cargocache-v2-deadlinks-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-deadlinks-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - run:
           name: Generate docs
           command: cargo doc
@@ -859,7 +859,7 @@ jobs:
             - target/debug/build
             - target/debug/deps
             - /root/.cache/pip
-          key: cargocache-v2-deadlinks-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-deadlinks-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   clippy:
     parameters:
@@ -935,7 +935,7 @@ jobs:
 
   benchmarking:
     docker:
-      - image: rust:1.64.0
+      - image: rust:1.67.0
     environment:
       RUST_BACKTRACE: 1
     steps:
@@ -945,7 +945,7 @@ jobs:
           command: rustc --version && cargo --version
       - restore_cache:
           keys:
-            - cargocache-v2-benchmarking-rust:1.64.0-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-benchmarking-rust:1.67.0-{{ checksum "Cargo.lock" }}
       - run:
           name: Run vm benchmarks (Singlepass)
           working_directory: ~/project/packages/vm
@@ -963,7 +963,7 @@ jobs:
             - target/release/.fingerprint
             - target/release/build
             - target/release/deps
-          key: cargocache-v2-benchmarking-rust:1.64.0-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-benchmarking-rust:1.67.0-{{ checksum "Cargo.lock" }}
 
   coverage:
     # https://circleci.com/developer/images?imageType=machine
@@ -1035,7 +1035,7 @@ jobs:
           name: Check development contracts
           command: |
             echo "Checking all contracts under ./artifacts"
-            docker run --volumes-from with_code rust:1.64.0 \
+            docker run --volumes-from with_code rust:1.67.0 \
               /bin/bash -e -c 'export GLOBIGNORE="artifacts/floaty.wasm"; cd ./code; cargo run --bin cosmwasm-check artifacts/*.wasm'
             docker cp with_code:/code/artifacts .
       - run:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3235e56020..b59d22676d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.64.0
+          toolchain: 1.67.0
           target: wasm32-unknown-unknown
           profile: minimal
           override: true

From 34ad3382232a877da12386d447b174946074e5c9 Mon Sep 17 00:00:00 2001
From: Christoph Otter <chris@confio.gmbh>
Date: Tue, 27 Jun 2023 12:13:03 +0200
Subject: [PATCH 09/13] Fix clippy lint

---
 contracts/crypto-verify/src/contract.rs       |  2 +-
 contracts/crypto-verify/src/ethereum.rs       |  3 +-
 contracts/hackatom/src/contract.rs            | 15 ++----
 contracts/hackatom/tests/integration.rs       | 10 ++--
 contracts/ibc-reflect-send/src/ibc.rs         | 15 +++---
 contracts/ibc-reflect-send/src/state.rs       |  2 +-
 .../ibc-reflect-send/tests/integration.rs     |  6 +--
 contracts/ibc-reflect/src/contract.rs         |  7 ++-
 contracts/ibc-reflect/src/state.rs            |  2 +-
 contracts/reflect/src/contract.rs             | 12 ++---
 contracts/reflect/src/state.rs                |  2 +-
 contracts/staking/src/contract.rs             |  8 +--
 contracts/staking/src/state.rs                |  2 +-
 packages/check/src/main.rs                    |  4 +-
 packages/crypto/src/ed25519.rs                |  3 +-
 packages/crypto/src/secp256k1.rs              | 10 ++--
 packages/derive/src/lib.rs                    |  9 ++--
 packages/schema-derive/src/generate_api.rs    |  2 +-
 .../src/query_responses/context.rs            |  4 +-
 packages/schema/src/idl.rs                    |  2 +-
 packages/schema/src/remove.rs                 |  2 +-
 packages/std/src/addresses.rs                 |  6 +--
 packages/std/src/binary.rs                    | 10 ++--
 packages/std/src/coin.rs                      |  4 +-
 packages/std/src/errors/std_error.rs          | 18 +++----
 packages/std/src/errors/system_error.rs       |  6 +--
 packages/std/src/hex_binary.rs                | 10 ++--
 packages/std/src/math/decimal.rs              | 40 +++++++-------
 packages/std/src/math/decimal256.rs           | 40 +++++++-------
 packages/std/src/math/uint128.rs              | 10 ++--
 packages/std/src/math/uint256.rs              | 13 +++--
 packages/std/src/math/uint512.rs              | 13 +++--
 packages/std/src/math/uint64.rs               | 10 ++--
 packages/std/src/results/contract_result.rs   |  6 +--
 packages/std/src/results/cosmos_msg.rs        |  6 +--
 packages/std/src/results/events.rs            |  3 +-
 packages/std/src/results/submessages.rs       |  4 +-
 packages/std/src/storage.rs                   | 12 ++---
 packages/std/src/testing/assertions.rs        |  6 +--
 packages/std/src/testing/mock.rs              | 28 +++++-----
 packages/std/src/timestamp.rs                 |  2 +-
 packages/std/src/traits.rs                    | 14 +++--
 packages/storage/src/bucket.rs                |  2 +-
 packages/storage/src/singleton.rs             |  4 +-
 packages/storage/src/type_helpers.rs          |  2 +-
 packages/vm/benches/main.rs                   |  2 +-
 packages/vm/examples/module_size.rs           |  4 +-
 packages/vm/examples/multi_threaded_cache.rs  |  2 +-
 packages/vm/src/backend.rs                    | 14 ++---
 packages/vm/src/cache.rs                      | 20 +++----
 packages/vm/src/calls.rs                      |  6 +--
 packages/vm/src/checksum.rs                   |  4 +-
 packages/vm/src/compatibility.rs              | 51 +++++++++---------
 packages/vm/src/conversion.rs                 | 14 ++---
 packages/vm/src/environment.rs                | 22 ++++----
 packages/vm/src/errors/communication_error.rs | 12 ++---
 .../vm/src/errors/region_validation_error.rs  |  6 +--
 packages/vm/src/errors/vm_error.rs            | 44 ++++++++--------
 packages/vm/src/imports.rs                    | 52 +++++++++----------
 packages/vm/src/instance.rs                   |  4 +-
 packages/vm/src/limited.rs                    |  4 +-
 packages/vm/src/memory.rs                     |  8 +--
 packages/vm/src/modules/file_system_cache.rs  | 11 ++--
 packages/vm/src/modules/in_memory_cache.rs    |  2 +-
 packages/vm/src/serde.rs                      |  2 +-
 packages/vm/src/static_analysis.rs            |  5 +-
 packages/vm/src/testing/instance.rs           |  3 +-
 packages/vm/src/testing/mock.rs               |  6 +--
 packages/vm/src/testing/querier.rs            |  4 +-
 packages/vm/src/wasm_backend/gatekeeper.rs    | 17 +++---
 .../vm/src/wasm_backend/limiting_tunables.rs  |  6 +--
 71 files changed, 341 insertions(+), 375 deletions(-)

diff --git a/contracts/crypto-verify/src/contract.rs b/contracts/crypto-verify/src/contract.rs
index 17d11b8a70..b2917a90c9 100644
--- a/contracts/crypto-verify/src/contract.rs
+++ b/contracts/crypto-verify/src/contract.rs
@@ -396,7 +396,7 @@ mod tests {
                 source: RecoverPubkeyError::UnknownErr { .. },
                 ..
             } => {}
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
diff --git a/contracts/crypto-verify/src/ethereum.rs b/contracts/crypto-verify/src/ethereum.rs
index bc6d8981dd..f6958a0230 100644
--- a/contracts/crypto-verify/src/ethereum.rs
+++ b/contracts/crypto-verify/src/ethereum.rs
@@ -88,8 +88,7 @@ pub fn get_recovery_param_with_chain_id(v: u64, chain_id: u64) -> StdResult<u8>
     match recovery {
         0 | 1 => Ok(recovery as u8),
         _ => Err(StdError::generic_err(format!(
-            "Calculated recovery parameter must be 0 or 1 but is {}.",
-            recovery
+            "Calculated recovery parameter must be 0 or 1 but is {recovery}."
         ))),
     }
 }
diff --git a/contracts/hackatom/src/contract.rs b/contracts/hackatom/src/contract.rs
index 26ffed649a..6de12ab53e 100644
--- a/contracts/hackatom/src/contract.rs
+++ b/contracts/hackatom/src/contract.rs
@@ -189,8 +189,7 @@ fn do_user_errors_in_api_calls(api: &dyn Api) -> Result<Response, HackError> {
         StdError::GenericErr { .. } => {}
         err => {
             return Err(StdError::generic_err(format!(
-                "Unexpected error in do_user_errors_in_api_calls: {:?}",
-                err
+                "Unexpected error in do_user_errors_in_api_calls: {err:?}"
             ))
             .into())
         }
@@ -202,8 +201,7 @@ fn do_user_errors_in_api_calls(api: &dyn Api) -> Result<Response, HackError> {
         StdError::GenericErr { .. } => {}
         err => {
             return Err(StdError::generic_err(format!(
-                "Unexpected error in do_user_errors_in_api_calls: {:?}",
-                err
+                "Unexpected error in do_user_errors_in_api_calls: {err:?}"
             ))
             .into())
         }
@@ -216,8 +214,7 @@ fn do_user_errors_in_api_calls(api: &dyn Api) -> Result<Response, HackError> {
         StdError::GenericErr { .. } => {}
         err => {
             return Err(StdError::generic_err(format!(
-                "Unexpected error in do_user_errors_in_api_calls: {:?}",
-                err
+                "Unexpected error in do_user_errors_in_api_calls: {err:?}"
             ))
             .into())
         }
@@ -228,8 +225,7 @@ fn do_user_errors_in_api_calls(api: &dyn Api) -> Result<Response, HackError> {
         StdError::GenericErr { .. } => {}
         err => {
             return Err(StdError::generic_err(format!(
-                "Unexpected error in do_user_errors_in_api_calls: {:?}",
-                err
+                "Unexpected error in do_user_errors_in_api_calls: {err:?}"
             ))
             .into())
         }
@@ -240,8 +236,7 @@ fn do_user_errors_in_api_calls(api: &dyn Api) -> Result<Response, HackError> {
         StdError::GenericErr { .. } => {}
         err => {
             return Err(StdError::generic_err(format!(
-                "Unexpected error in do_user_errors_in_api_calls: {:?}",
-                err
+                "Unexpected error in do_user_errors_in_api_calls: {err:?}"
             ))
             .into())
         }
diff --git a/contracts/hackatom/tests/integration.rs b/contracts/hackatom/tests/integration.rs
index 84bdf53153..10f77d091c 100644
--- a/contracts/hackatom/tests/integration.rs
+++ b/contracts/hackatom/tests/integration.rs
@@ -407,7 +407,7 @@ fn execute_allocate_large_memory() {
     // which we only fix when using rust-optimizer, not integration tests.
     assert_approx_eq!(gas_used, 4413600000, "0.2");
     let used = deps.memory_pages();
-    assert_eq!(used, pages_before + 48, "Memory used: {} pages", used);
+    assert_eq!(used, pages_before + 48, "Memory used: {used} pages");
     pages_before += 48;
 
     // Grow by 1600 pages (100 MiB)
@@ -425,10 +425,10 @@ fn execute_allocate_large_memory() {
     // Note: the exact gas usage depends on the Rust version used to compile Wasm,
     // which we only fix when using rust-optimizer, not integration tests.
     let expected = 4859700000; // +/- 20%
-    assert!(gas_used > expected * 80 / 100, "Gas used: {}", gas_used);
-    assert!(gas_used < expected * 120 / 100, "Gas used: {}", gas_used);
+    assert!(gas_used > expected * 80 / 100, "Gas used: {gas_used}");
+    assert!(gas_used < expected * 120 / 100, "Gas used: {gas_used}");
     let used = deps.memory_pages();
-    assert_eq!(used, pages_before, "Memory used: {} pages", used);
+    assert_eq!(used, pages_before, "Memory used: {used} pages");
 }
 
 #[test]
@@ -458,7 +458,7 @@ fn execute_panic() {
             );
             assert!(msg.contains("contract.rs:"), "Must contain file and line");
         }
-        err => panic!("Unexpected error: {:?}", err),
+        err => panic!("Unexpected error: {err:?}"),
     }
 }
 
diff --git a/contracts/ibc-reflect-send/src/ibc.rs b/contracts/ibc-reflect-send/src/ibc.rs
index 76939acea8..adede549eb 100644
--- a/contracts/ibc-reflect-send/src/ibc.rs
+++ b/contracts/ibc-reflect-send/src/ibc.rs
@@ -25,16 +25,14 @@ pub fn ibc_channel_open(_deps: DepsMut, _env: Env, msg: IbcChannelOpenMsg) -> St
     }
     if channel.version.as_str() != IBC_APP_VERSION {
         return Err(StdError::generic_err(format!(
-            "Must set version to `{}`",
-            IBC_APP_VERSION
+            "Must set version to `{IBC_APP_VERSION}`"
         )));
     }
 
     if let Some(counter_version) = msg.counterparty_version() {
         if counter_version != IBC_APP_VERSION {
             return Err(StdError::generic_err(format!(
-                "Counterparty version must be `{}`",
-                IBC_APP_VERSION
+                "Counterparty version must be `{IBC_APP_VERSION}`"
             )));
         }
     }
@@ -190,8 +188,7 @@ fn acknowledge_balances(
             if let Some(old_addr) = acct.remote_addr {
                 if old_addr != account {
                     return Err(StdError::generic_err(format!(
-                        "remote account changed from {} to {}",
-                        old_addr, account
+                        "remote account changed from {old_addr} to {account}"
                     )));
                 }
             }
@@ -265,7 +262,7 @@ mod tests {
                 channel_id: packet_channel,
                 ..
             }) => assert_eq!(packet_channel.as_str(), channel_id),
-            o => panic!("Unexpected message: {:?}", o),
+            o => panic!("Unexpected message: {o:?}"),
         };
     }
 
@@ -362,7 +359,7 @@ mod tests {
                 msg.original_packet.data = data;
                 msg
             }
-            o => panic!("Unexpected message: {:?}", o),
+            o => panic!("Unexpected message: {o:?}"),
         };
         let res = ibc_packet_ack(deps.as_mut(), mock_env(), msg).unwrap();
         // no actions expected, but let's check the events to see it was dispatched properly
@@ -420,7 +417,7 @@ mod tests {
                 assert!(timeout.block().is_none());
                 assert!(timeout.timestamp().is_some());
             }
-            o => panic!("unexpected message: {:?}", o),
+            o => panic!("unexpected message: {o:?}"),
         }
     }
 }
diff --git a/contracts/ibc-reflect-send/src/state.rs b/contracts/ibc-reflect-send/src/state.rs
index 3da062710d..062ff187e4 100644
--- a/contracts/ibc-reflect-send/src/state.rs
+++ b/contracts/ibc-reflect-send/src/state.rs
@@ -38,7 +38,7 @@ pub fn may_load_account(storage: &dyn Storage, id: &str) -> StdResult<Option<Acc
 }
 
 pub fn load_account(storage: &dyn Storage, id: &str) -> StdResult<AccountData> {
-    may_load_account(storage, id)?.ok_or_else(|| StdError::not_found(format!("account {}", id)))
+    may_load_account(storage, id)?.ok_or_else(|| StdError::not_found(format!("account {id}")))
 }
 
 pub fn save_account(storage: &mut dyn Storage, id: &str, account: &AccountData) -> StdResult<()> {
diff --git a/contracts/ibc-reflect-send/tests/integration.rs b/contracts/ibc-reflect-send/tests/integration.rs
index c0c2977b83..21d5c95352 100644
--- a/contracts/ibc-reflect-send/tests/integration.rs
+++ b/contracts/ibc-reflect-send/tests/integration.rs
@@ -72,7 +72,7 @@ fn connect(deps: &mut Instance<MockApi, MockStorage, MockQuerier>, channel_id: &
             channel_id: packet_channel,
             ..
         }) => assert_eq!(packet_channel.as_str(), channel_id),
-        o => panic!("Unexpected message: {:?}", o),
+        o => panic!("Unexpected message: {o:?}"),
     };
 }
 
@@ -183,7 +183,7 @@ fn dispatch_message_send_and_ack() {
             msg.original_packet.data = data;
             msg
         }
-        o => panic!("Unexpected message: {:?}", o),
+        o => panic!("Unexpected message: {o:?}"),
     };
     let res: IbcBasicResponse = ibc_packet_ack(&mut deps, mock_env(), msg).unwrap();
     // no actions expected, but let's check the events to see it was dispatched properly
@@ -241,6 +241,6 @@ fn send_remote_funds() {
             assert!(timeout.block().is_none());
             assert!(timeout.timestamp().is_some());
         }
-        o => panic!("unexpected message: {:?}", o),
+        o => panic!("unexpected message: {o:?}"),
     }
 }
diff --git a/contracts/ibc-reflect/src/contract.rs b/contracts/ibc-reflect/src/contract.rs
index 0e5ca04e0e..23fa7046a3 100644
--- a/contracts/ibc-reflect/src/contract.rs
+++ b/contracts/ibc-reflect/src/contract.rs
@@ -136,8 +136,7 @@ pub fn ibc_channel_open(
     if let Some(counter_version) = msg.counterparty_version() {
         if counter_version != IBC_APP_VERSION {
             return Err(StdError::generic_err(format!(
-                "Counterparty version must be `{}`",
-                IBC_APP_VERSION
+                "Counterparty version must be `{IBC_APP_VERSION}`"
             )));
         }
     }
@@ -164,7 +163,7 @@ pub fn ibc_channel_connect(
         code_id: cfg.reflect_code_id,
         msg: b"{}".into(),
         funds: vec![],
-        label: format!("ibc-reflect-{}", chan_id),
+        label: format!("ibc-reflect-{chan_id}"),
     };
     let msg = SubMsg::reply_on_success(msg, INIT_CALLBACK_ID);
 
@@ -255,7 +254,7 @@ pub fn ibc_packet_receive(
     .or_else(|e| {
         // we try to capture all app-level errors and convert them into
         // acknowledgement packets that contain an error code.
-        let acknowledgement = encode_ibc_error(format!("invalid packet: {}", e));
+        let acknowledgement = encode_ibc_error(format!("invalid packet: {e}"));
         Ok(IbcReceiveResponse::new()
             .set_ack(acknowledgement)
             .add_event(Event::new("ibc").add_attribute("packet", "receive")))
diff --git a/contracts/ibc-reflect/src/state.rs b/contracts/ibc-reflect/src/state.rs
index bd9a342247..bbb1fdaaa1 100644
--- a/contracts/ibc-reflect/src/state.rs
+++ b/contracts/ibc-reflect/src/state.rs
@@ -27,7 +27,7 @@ pub fn may_load_account(storage: &dyn Storage, id: &str) -> StdResult<Option<Add
 }
 
 pub fn load_account(storage: &dyn Storage, id: &str) -> StdResult<Addr> {
-    may_load_account(storage, id)?.ok_or_else(|| StdError::not_found(format!("account {}", id)))
+    may_load_account(storage, id)?.ok_or_else(|| StdError::not_found(format!("account {id}")))
 }
 
 pub fn save_account(storage: &mut dyn Storage, id: &str, account: &Addr) -> StdResult<()> {
diff --git a/contracts/reflect/src/contract.rs b/contracts/reflect/src/contract.rs
index 5334dbcbc1..2213bd4b92 100644
--- a/contracts/reflect/src/contract.rs
+++ b/contracts/reflect/src/contract.rs
@@ -150,16 +150,14 @@ fn query_chain(
     request: &QueryRequest<SpecialQuery>,
 ) -> StdResult<ChainResponse> {
     let raw = to_vec(request).map_err(|serialize_err| {
-        StdError::generic_err(format!("Serializing QueryRequest: {}", serialize_err))
+        StdError::generic_err(format!("Serializing QueryRequest: {serialize_err}"))
     })?;
     match deps.querier.raw_query(&raw) {
         SystemResult::Err(system_err) => Err(StdError::generic_err(format!(
-            "Querier system error: {}",
-            system_err
+            "Querier system error: {system_err}"
         ))),
         SystemResult::Ok(ContractResult::Err(contract_err)) => Err(StdError::generic_err(format!(
-            "Querier contract error: {}",
-            contract_err
+            "Querier contract error: {contract_err}"
         ))),
         SystemResult::Ok(ContractResult::Ok(value)) => Ok(ChainResponse { data: value }),
     }
@@ -241,7 +239,7 @@ mod tests {
         let res = execute(deps.as_mut(), mock_env(), info, msg);
         match res.unwrap_err() {
             ReflectError::NotCurrentOwner { .. } => {}
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
@@ -355,7 +353,7 @@ mod tests {
             ReflectError::Std(StdError::GenericErr { msg, .. }) => {
                 assert!(msg.contains("human address too short"))
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
diff --git a/contracts/reflect/src/state.rs b/contracts/reflect/src/state.rs
index 428a451df9..417c76315e 100644
--- a/contracts/reflect/src/state.rs
+++ b/contracts/reflect/src/state.rs
@@ -18,7 +18,7 @@ pub struct State {
 pub fn load_reply(storage: &dyn Storage, id: u64) -> StdResult<Reply> {
     storage
         .get(&namespace_with_key(&[RESULT_PREFIX], &id.to_be_bytes()))
-        .ok_or_else(|| StdError::not_found(format!("reply {}", id)))
+        .ok_or_else(|| StdError::not_found(format!("reply {id}")))
         .and_then(|v| from_slice(&v))
 }
 
diff --git a/contracts/staking/src/contract.rs b/contracts/staking/src/contract.rs
index 456fdb6c9d..ada3c22252 100644
--- a/contracts/staking/src/contract.rs
+++ b/contracts/staking/src/contract.rs
@@ -570,7 +570,7 @@ mod tests {
                 assert_eq!(validator.as_str(), DEFAULT_VALIDATOR);
                 assert_eq!(amount, &coin(1000, "ustake"));
             }
-            _ => panic!("Unexpected message: {:?}", delegate),
+            _ => panic!("Unexpected message: {delegate:?}"),
         }
 
         // bob got 1000 DRV for 1000 stake at a 1.0 ratio
@@ -666,7 +666,7 @@ mod tests {
             StakingError::Std {
                 original: StdError::GenericErr { msg, .. },
             } => assert_eq!(msg, "No ustake tokens sent"),
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         };
     }
 
@@ -715,7 +715,7 @@ mod tests {
             StakingError::Std {
                 original: StdError::Overflow { .. },
             } => {}
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
 
         // bob unbonds 600 tokens at 10% tax...
@@ -736,7 +736,7 @@ mod tests {
                 assert_eq!(validator.as_str(), DEFAULT_VALIDATOR);
                 assert_eq!(amount, &coin(bobs_claim.u128(), "ustake"));
             }
-            _ => panic!("Unexpected message: {:?}", delegate),
+            _ => panic!("Unexpected message: {delegate:?}"),
         }
 
         // update the querier with new bond, lower balance
diff --git a/contracts/staking/src/state.rs b/contracts/staking/src/state.rs
index 0b99fe75c6..40e875db29 100644
--- a/contracts/staking/src/state.rs
+++ b/contracts/staking/src/state.rs
@@ -39,7 +39,7 @@ pub fn save_map(
 
 pub fn load_map(storage: &dyn Storage, prefix: &[u8], key: &CanonicalAddr) -> StdResult<Uint128> {
     may_load_map(storage, prefix, key)?
-        .ok_or_else(|| StdError::not_found(format!("map value for {}", key)))
+        .ok_or_else(|| StdError::not_found(format!("map value for {key}")))
 }
 
 /// Investment info is fixed at initialization, and is used to control the function of the contract
diff --git a/packages/check/src/main.rs b/packages/check/src/main.rs
index 561992bb28..d190a64656 100644
--- a/packages/check/src/main.rs
+++ b/packages/check/src/main.rs
@@ -44,7 +44,7 @@ pub fn main() {
         .map(|s| s.as_str())
         .unwrap_or(DEFAULT_AVAILABLE_CAPABILITIES);
     let available_capabilities = capabilities_from_csv(available_capabilities_csv);
-    println!("Available capabilities: {:?}", available_capabilities);
+    println!("Available capabilities: {available_capabilities:?}");
     println!();
 
     // File
@@ -59,7 +59,7 @@ pub fn main() {
                 Ok(_) => println!("{}: {}", p, "pass".green()),
                 Err(e) => {
                     println!("{}: {}", p, "failure".red());
-                    println!("{}", e);
+                    println!("{e}");
                 }
             };
             result
diff --git a/packages/crypto/src/ed25519.rs b/packages/crypto/src/ed25519.rs
index c53449cd8d..7b87affcd8 100644
--- a/packages/crypto/src/ed25519.rs
+++ b/packages/crypto/src/ed25519.rs
@@ -253,8 +253,7 @@ mod tests {
             // ed25519_verify() works
             assert!(
                 ed25519_verify(&message, &signature, &public_key).unwrap(),
-                "verify() failed (test case {})",
-                i
+                "verify() failed (test case {i})"
             );
         }
     }
diff --git a/packages/crypto/src/secp256k1.rs b/packages/crypto/src/secp256k1.rs
index ae42f83a5d..8ccc1cec06 100644
--- a/packages/crypto/src/secp256k1.rs
+++ b/packages/crypto/src/secp256k1.rs
@@ -348,7 +348,7 @@ mod tests {
         {
             let expected_x = "F3F8BB913AA68589A2C8C607A877AB05252ADBD963E1BE846DDEB8456942AEDC";
             let expected_y = "A2ED51F08CA3EF3DAC0A7504613D54CD539FC1B3CBC92453CD704B6A2D012B2C";
-            let expected = hex::decode(format!("04{}{}", expected_x, expected_y)).unwrap();
+            let expected = hex::decode(format!("04{expected_x}{expected_y}")).unwrap();
             let r_s = hex!("E30F2E6A0F705F4FB5F8501BA79C7C0D3FAC847F1AD70B873E9797B17B89B39081F1A4457589F30D76AB9F89E748A68C8A94C30FE0BAC8FB5C0B54EA70BF6D2F");
             let recovery_param: u8 = 0;
             let message_hash =
@@ -404,24 +404,24 @@ mod tests {
         let recovery_param: u8 = 2;
         match secp256k1_recover_pubkey(&message_hash, &r_s, recovery_param).unwrap_err() {
             CryptoError::InvalidRecoveryParam { .. } => {}
-            err => panic!("Unexpected error: {}", err),
+            err => panic!("Unexpected error: {err}"),
         }
         let recovery_param: u8 = 3;
         match secp256k1_recover_pubkey(&message_hash, &r_s, recovery_param).unwrap_err() {
             CryptoError::InvalidRecoveryParam { .. } => {}
-            err => panic!("Unexpected error: {}", err),
+            err => panic!("Unexpected error: {err}"),
         }
 
         // Other values are garbage
         let recovery_param: u8 = 4;
         match secp256k1_recover_pubkey(&message_hash, &r_s, recovery_param).unwrap_err() {
             CryptoError::InvalidRecoveryParam { .. } => {}
-            err => panic!("Unexpected error: {}", err),
+            err => panic!("Unexpected error: {err}"),
         }
         let recovery_param: u8 = 255;
         match secp256k1_recover_pubkey(&message_hash, &r_s, recovery_param).unwrap_err() {
             CryptoError::InvalidRecoveryParam { .. } => {}
-            err => panic!("Unexpected error: {}", err),
+            err => panic!("Unexpected error: {err}"),
         }
     }
 }
diff --git a/packages/derive/src/lib.rs b/packages/derive/src/lib.rs
index 349f9e3094..1a0f516f1f 100644
--- a/packages/derive/src/lib.rs
+++ b/packages/derive/src/lib.rs
@@ -60,9 +60,9 @@ pub fn entry_point(_attr: TokenStream, mut item: TokenStream) -> TokenStream {
     let args = function.sig.inputs.len() - 1;
 
     // E.g. "ptr0: u32, ptr1: u32, ptr2: u32, "
-    let typed_ptrs = (0..args).fold(String::new(), |acc, i| format!("{}ptr{}: u32, ", acc, i));
+    let typed_ptrs = (0..args).fold(String::new(), |acc, i| format!("{acc}ptr{i}: u32, "));
     // E.g. "ptr0, ptr1, ptr2, "
-    let ptrs = (0..args).fold(String::new(), |acc, i| format!("{}ptr{}, ", acc, i));
+    let ptrs = (0..args).fold(String::new(), |acc, i| format!("{acc}ptr{i}, "));
 
     let new_code = format!(
         r##"
@@ -73,10 +73,7 @@ pub fn entry_point(_attr: TokenStream, mut item: TokenStream) -> TokenStream {
                 cosmwasm_std::do_{name}(&super::{name}, {ptrs})
             }}
         }}
-    "##,
-        name = name,
-        typed_ptrs = typed_ptrs,
-        ptrs = ptrs
+    "##
     );
     let entry = TokenStream::from_str(&new_code).unwrap();
     item.extend(entry);
diff --git a/packages/schema-derive/src/generate_api.rs b/packages/schema-derive/src/generate_api.rs
index 1864ce2ba5..1306aa613d 100644
--- a/packages/schema-derive/src/generate_api.rs
+++ b/packages/schema-derive/src/generate_api.rs
@@ -200,7 +200,7 @@ impl Parse for Options {
         };
 
         if let Some((invalid_option, _)) = map.into_iter().next() {
-            panic!("unknown generate_api option: {}", invalid_option);
+            panic!("unknown generate_api option: {invalid_option}");
         }
 
         Ok(Self {
diff --git a/packages/schema-derive/src/query_responses/context.rs b/packages/schema-derive/src/query_responses/context.rs
index ed7f425f1d..6c45bd1f2c 100644
--- a/packages/schema-derive/src/query_responses/context.rs
+++ b/packages/schema-derive/src/query_responses/context.rs
@@ -22,7 +22,7 @@ pub fn get_context(input: &ItemEnum) -> Context {
             if let Meta::List(l) = attr.parse_meta().unwrap() {
                 l.nested
             } else {
-                panic!("{} attribute must contain a meta list", ATTR_PATH);
+                panic!("{ATTR_PATH} attribute must contain a meta list");
             }
         })
         .map(|nested_meta| {
@@ -55,7 +55,7 @@ pub fn get_context(input: &ItemEnum) -> Context {
                 }
             }
             "nested" => ctx.is_nested = true,
-            path => panic!("unrecognized QueryResponses param: {}", path),
+            path => panic!("unrecognized QueryResponses param: {path}"),
         }
     }
 
diff --git a/packages/schema/src/idl.rs b/packages/schema/src/idl.rs
index 0cad4da9f0..80166b7cdb 100644
--- a/packages/schema/src/idl.rs
+++ b/packages/schema/src/idl.rs
@@ -118,7 +118,7 @@ impl JsonApi {
         if let Some(responses) = &self.responses {
             for (name, response) in responses {
                 result.push((
-                    format!("response_to_{}.json", name),
+                    format!("response_to_{name}.json"),
                     serde_json::to_string_pretty(&response)?,
                 ));
             }
diff --git a/packages/schema/src/remove.rs b/packages/schema/src/remove.rs
index 2b7c2359ef..a5e50f0708 100644
--- a/packages/schema/src/remove.rs
+++ b/packages/schema/src/remove.rs
@@ -28,7 +28,7 @@ pub fn remove_schemas(schemas_dir: &path::Path) -> Result<(), io::Error> {
         ;
 
     for file_path in file_paths {
-        println!("Removing {:?} …", file_path);
+        println!("Removing {file_path:?} …");
         fs::remove_file(file_path)?;
     }
     Ok(())
diff --git a/packages/std/src/addresses.rs b/packages/std/src/addresses.rs
index ed47876a83..8ca10d0544 100644
--- a/packages/std/src/addresses.rs
+++ b/packages/std/src/addresses.rs
@@ -284,7 +284,7 @@ impl CanonicalAddr {
 impl fmt::Display for CanonicalAddr {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         for byte in self.0.as_slice() {
-            write!(f, "{:02X}", byte)?;
+            write!(f, "{byte:02X}")?;
         }
         Ok(())
     }
@@ -432,7 +432,7 @@ mod tests {
     #[test]
     fn addr_implements_display() {
         let addr = Addr::unchecked("cos934gh9034hg04g0h134");
-        let embedded = format!("Address: {}", addr);
+        let embedded = format!("Address: {addr}");
         assert_eq!(embedded, "Address: cos934gh9034hg04g0h134");
         assert_eq!(addr.to_string(), "cos934gh9034hg04g0h134");
     }
@@ -629,7 +629,7 @@ mod tests {
             0xff,
         ];
         let address = CanonicalAddr::from(bytes);
-        let embedded = format!("Address: {}", address);
+        let embedded = format!("Address: {address}");
         assert_eq!(embedded, "Address: 1203AB00FF");
         assert_eq!(address.to_string(), "1203AB00FF");
     }
diff --git a/packages/std/src/binary.rs b/packages/std/src/binary.rs
index 4e69b0ff20..15bac355d8 100644
--- a/packages/std/src/binary.rs
+++ b/packages/std/src/binary.rs
@@ -76,7 +76,7 @@ impl fmt::Debug for Binary {
         // but with a custom implementation to avoid the need for an intemediate hex string.
         write!(f, "Binary(")?;
         for byte in self.0.iter() {
-            write!(f, "{:02x}", byte)?;
+            write!(f, "{byte:02x}")?;
         }
         write!(f, ")")?;
         Ok(())
@@ -230,7 +230,7 @@ impl<'de> de::Visitor<'de> for Base64Visitor {
     {
         match Binary::from_base64(v) {
             Ok(binary) => Ok(binary),
-            Err(_) => Err(E::custom(format!("invalid base64: {}", v))),
+            Err(_) => Err(E::custom(format!("invalid base64: {v}"))),
         }
     }
 }
@@ -284,7 +284,7 @@ mod tests {
                 assert_eq!(expected, 8);
                 assert_eq!(actual, 3);
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
 
         // long array (32 bytes)
@@ -483,11 +483,11 @@ mod tests {
     fn binary_implements_debug() {
         // Some data
         let binary = Binary(vec![0x07, 0x35, 0xAA, 0xcb, 0x00, 0xff]);
-        assert_eq!(format!("{:?}", binary), "Binary(0735aacb00ff)",);
+        assert_eq!(format!("{binary:?}"), "Binary(0735aacb00ff)",);
 
         // Empty
         let binary = Binary(vec![]);
-        assert_eq!(format!("{:?}", binary), "Binary()",);
+        assert_eq!(format!("{binary:?}"), "Binary()",);
     }
 
     #[test]
diff --git a/packages/std/src/coin.rs b/packages/std/src/coin.rs
index 0838958efa..15d153cfc3 100644
--- a/packages/std/src/coin.rs
+++ b/packages/std/src/coin.rs
@@ -120,7 +120,7 @@ mod tests {
             denom: "ucosm".to_string(),
         };
 
-        let embedded = format!("Amount: {}", a);
+        let embedded = format!("Amount: {a}");
         assert_eq!(embedded, "Amount: 123ucosm");
         assert_eq!(a.to_string(), "123ucosm");
     }
@@ -245,6 +245,6 @@ mod tests {
     #[test]
     fn debug_coin() {
         let coin = Coin::new(123, "ucosm");
-        assert_eq!(format!("{:?}", coin), r#"Coin { 123 "ucosm" }"#);
+        assert_eq!(format!("{coin:?}"), r#"Coin { 123 "ucosm" }"#);
     }
 }
diff --git a/packages/std/src/errors/std_error.rs b/packages/std/src/errors/std_error.rs
index d90171c74c..e77d0c0f1f 100644
--- a/packages/std/src/errors/std_error.rs
+++ b/packages/std/src/errors/std_error.rs
@@ -488,7 +488,7 @@ pub enum OverflowOperation {
 
 impl fmt::Display for OverflowOperation {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{:?}", self)
+        write!(f, "{self:?}")
     }
 }
 
@@ -608,7 +608,7 @@ impl From<std::num::ParseIntError> for CoinFromStrError {
 
 impl From<CoinFromStrError> for StdError {
     fn from(value: CoinFromStrError) -> Self {
-        Self::generic_err(format!("Parsing Coin: {}", value))
+        Self::generic_err(format!("Parsing Coin: {value}"))
     }
 }
 
@@ -623,12 +623,12 @@ mod tests {
     #[test]
     fn generic_err_owned() {
         let guess = 7;
-        let error = StdError::generic_err(format!("{} is too low", guess));
+        let error = StdError::generic_err(format!("{guess} is too low"));
         match error {
             StdError::GenericErr { msg, .. } => {
                 assert_eq!(msg, String::from("7 is too low"));
             }
-            e => panic!("unexpected error, {:?}", e),
+            e => panic!("unexpected error, {e:?}"),
         }
     }
 
@@ -638,7 +638,7 @@ mod tests {
         let error = StdError::generic_err("not implemented");
         match error {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "not implemented"),
-            e => panic!("unexpected error, {:?}", e),
+            e => panic!("unexpected error, {e:?}"),
         }
     }
 
@@ -820,7 +820,7 @@ mod tests {
     #[test]
     fn implements_debug() {
         let error: StdError = StdError::from(OverflowError::new(OverflowOperation::Sub, 3, 5));
-        let embedded = format!("Debug: {:?}", error);
+        let embedded = format!("Debug: {error:?}");
         #[cfg(not(feature = "backtraces"))]
         let expected = r#"Debug: Overflow { source: OverflowError { operation: Sub, operand1: "3", operand2: "5" } }"#;
         #[cfg(feature = "backtraces")]
@@ -831,7 +831,7 @@ mod tests {
     #[test]
     fn implements_display() {
         let error: StdError = StdError::from(OverflowError::new(OverflowOperation::Sub, 3, 5));
-        let embedded = format!("Display: {}", error);
+        let embedded = format!("Display: {error}");
         assert_eq!(embedded, "Display: Overflow: Cannot Sub with 3 and 5");
     }
 
@@ -859,7 +859,7 @@ mod tests {
             StdError::InvalidUtf8 { msg, .. } => {
                 assert_eq!(msg, "invalid utf-8 sequence of 3 bytes from index 6")
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
@@ -872,7 +872,7 @@ mod tests {
             StdError::InvalidUtf8 { msg, .. } => {
                 assert_eq!(msg, "invalid utf-8 sequence of 3 bytes from index 6")
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 }
diff --git a/packages/std/src/errors/system_error.rs b/packages/std/src/errors/system_error.rs
index d763f213c8..22223692c1 100644
--- a/packages/std/src/errors/system_error.rs
+++ b/packages/std/src/errors/system_error.rs
@@ -56,11 +56,11 @@ impl std::fmt::Display for SystemError {
                 error,
                 String::from_utf8_lossy(response)
             ),
-            SystemError::NoSuchContract { addr } => write!(f, "No such contract: {}", addr),
-            SystemError::NoSuchCode { code_id } => write!(f, "No such code: {}", code_id),
+            SystemError::NoSuchContract { addr } => write!(f, "No such contract: {addr}"),
+            SystemError::NoSuchCode { code_id } => write!(f, "No such code: {code_id}"),
             SystemError::Unknown {} => write!(f, "Unknown system error"),
             SystemError::UnsupportedRequest { kind } => {
-                write!(f, "Unsupported query type: {}", kind)
+                write!(f, "Unsupported query type: {kind}")
             }
         }
     }
diff --git a/packages/std/src/hex_binary.rs b/packages/std/src/hex_binary.rs
index fcbcc4c05b..bc3bc5ba21 100644
--- a/packages/std/src/hex_binary.rs
+++ b/packages/std/src/hex_binary.rs
@@ -72,7 +72,7 @@ impl fmt::Debug for HexBinary {
         // but with a custom implementation to avoid the need for an intemediate hex string.
         write!(f, "HexBinary(")?;
         for byte in self.0.iter() {
-            write!(f, "{:02x}", byte)?;
+            write!(f, "{byte:02x}")?;
         }
         write!(f, ")")?;
         Ok(())
@@ -238,7 +238,7 @@ impl<'de> de::Visitor<'de> for HexVisitor {
     {
         match HexBinary::from_hex(v) {
             Ok(data) => Ok(data),
-            Err(_) => Err(E::custom(format!("invalid hex: {}", v))),
+            Err(_) => Err(E::custom(format!("invalid hex: {v}"))),
         }
     }
 }
@@ -345,7 +345,7 @@ mod tests {
                 assert_eq!(expected, 8);
                 assert_eq!(actual, 3);
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
 
         // long array (32 bytes)
@@ -547,11 +547,11 @@ mod tests {
     fn hex_binary_implements_debug() {
         // Some data
         let data = HexBinary(vec![0x07, 0x35, 0xAA, 0xcb, 0x00, 0xff]);
-        assert_eq!(format!("{:?}", data), "HexBinary(0735aacb00ff)",);
+        assert_eq!(format!("{data:?}"), "HexBinary(0735aacb00ff)",);
 
         // Empty
         let data = HexBinary(vec![]);
-        assert_eq!(format!("{:?}", data), "HexBinary()",);
+        assert_eq!(format!("{data:?}"), "HexBinary()",);
     }
 
     #[test]
diff --git a/packages/std/src/math/decimal.rs b/packages/std/src/math/decimal.rs
index 9e4e3424aa..29eb2a6b73 100644
--- a/packages/std/src/math/decimal.rs
+++ b/packages/std/src/math/decimal.rs
@@ -517,7 +517,7 @@ impl fmt::Display for Decimal {
         let fractional = (self.0).checked_rem(Self::DECIMAL_FRACTIONAL).unwrap();
 
         if fractional.is_zero() {
-            write!(f, "{}", whole)
+            write!(f, "{whole}")
         } else {
             let fractional_string = format!(
                 "{:0>padding$}",
@@ -534,7 +534,7 @@ impl fmt::Display for Decimal {
 
 impl fmt::Debug for Decimal {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Decimal({})", self)
+        write!(f, "Decimal({self})")
     }
 }
 
@@ -723,7 +723,7 @@ impl<'de> de::Visitor<'de> for DecimalVisitor {
     {
         match Decimal::from_str(v) {
             Ok(d) => Ok(d),
-            Err(e) => Err(E::custom(format!("Error parsing decimal '{}': {}", v, e))),
+            Err(e) => Err(E::custom(format!("Error parsing decimal '{v}': {e}"))),
         }
     }
 }
@@ -988,17 +988,17 @@ mod tests {
     fn decimal_from_str_errors_for_broken_whole_part() {
         match Decimal::from_str("").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Error parsing whole"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         match Decimal::from_str(" ").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Error parsing whole"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         match Decimal::from_str("-1").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Error parsing whole"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -1006,22 +1006,22 @@ mod tests {
     fn decimal_from_str_errors_for_broken_fractinal_part() {
         match Decimal::from_str("1.").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Error parsing fractional"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         match Decimal::from_str("1. ").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Error parsing fractional"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         match Decimal::from_str("1.e").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Error parsing fractional"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         match Decimal::from_str("1.2e3").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Error parsing fractional"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -1031,7 +1031,7 @@ mod tests {
             StdError::GenericErr { msg, .. } => {
                 assert_eq!(msg, "Cannot parse more than 18 fractional digits",)
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         // No special rules for trailing zeros. This could be changed but adds gas cost for the happy path.
@@ -1039,7 +1039,7 @@ mod tests {
             StdError::GenericErr { msg, .. } => {
                 assert_eq!(msg, "Cannot parse more than 18 fractional digits")
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -1047,12 +1047,12 @@ mod tests {
     fn decimal_from_str_errors_for_invalid_number_of_dots() {
         match Decimal::from_str("1.2.3").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Unexpected number of dots"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         match Decimal::from_str("1.2.3.4").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Unexpected number of dots"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -1061,17 +1061,17 @@ mod tests {
         // Integer
         match Decimal::from_str("340282366920938463464").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Value too big"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         // Decimal
         match Decimal::from_str("340282366920938463464.0").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Value too big"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
         match Decimal::from_str("340282366920938463463.374607431768211456").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Value too big"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -2145,13 +2145,13 @@ mod tests {
     #[test]
     fn decimal_implements_debug() {
         let decimal = Decimal::from_str("123.45").unwrap();
-        assert_eq!(format!("{:?}", decimal), "Decimal(123.45)");
+        assert_eq!(format!("{decimal:?}"), "Decimal(123.45)");
 
         let test_cases = ["5", "5.01", "42", "0", "2"];
         for s in test_cases {
             let decimal = Decimal::from_str(s).unwrap();
-            let expected = format!("Decimal({})", s);
-            assert_eq!(format!("{:?}", decimal), expected);
+            let expected = format!("Decimal({s})");
+            assert_eq!(format!("{decimal:?}"), expected);
         }
     }
 }
diff --git a/packages/std/src/math/decimal256.rs b/packages/std/src/math/decimal256.rs
index 157e7397b7..b3df870ad7 100644
--- a/packages/std/src/math/decimal256.rs
+++ b/packages/std/src/math/decimal256.rs
@@ -541,7 +541,7 @@ impl fmt::Display for Decimal256 {
         let fractional = (self.0).checked_rem(Self::DECIMAL_FRACTIONAL).unwrap();
 
         if fractional.is_zero() {
-            write!(f, "{}", whole)
+            write!(f, "{whole}")
         } else {
             let fractional_string = format!(
                 "{:0>padding$}",
@@ -558,7 +558,7 @@ impl fmt::Display for Decimal256 {
 
 impl fmt::Debug for Decimal256 {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Decimal256({})", self)
+        write!(f, "Decimal256({self})")
     }
 }
 
@@ -747,7 +747,7 @@ impl<'de> de::Visitor<'de> for Decimal256Visitor {
     {
         match Self::Value::from_str(v) {
             Ok(d) => Ok(d),
-            Err(e) => Err(E::custom(format!("Error parsing decimal '{}': {}", v, e))),
+            Err(e) => Err(E::custom(format!("Error parsing decimal '{v}': {e}"))),
         }
     }
 }
@@ -1089,17 +1089,17 @@ mod tests {
     fn decimal256_from_str_errors_for_broken_whole_part() {
         match Decimal256::from_str("").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Error parsing whole"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         match Decimal256::from_str(" ").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Error parsing whole"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         match Decimal256::from_str("-1").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Error parsing whole"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -1107,22 +1107,22 @@ mod tests {
     fn decimal256_from_str_errors_for_broken_fractinal_part() {
         match Decimal256::from_str("1.").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Error parsing fractional"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         match Decimal256::from_str("1. ").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Error parsing fractional"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         match Decimal256::from_str("1.e").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Error parsing fractional"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         match Decimal256::from_str("1.2e3").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Error parsing fractional"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -1132,7 +1132,7 @@ mod tests {
             StdError::GenericErr { msg, .. } => {
                 assert_eq!(msg, "Cannot parse more than 18 fractional digits")
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         // No special rules for trailing zeros. This could be changed but adds gas cost for the happy path.
@@ -1140,7 +1140,7 @@ mod tests {
             StdError::GenericErr { msg, .. } => {
                 assert_eq!(msg, "Cannot parse more than 18 fractional digits")
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -1148,12 +1148,12 @@ mod tests {
     fn decimal256_from_str_errors_for_invalid_number_of_dots() {
         match Decimal256::from_str("1.2.3").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Unexpected number of dots"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         match Decimal256::from_str("1.2.3.4").unwrap_err() {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Unexpected number of dots"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -1164,7 +1164,7 @@ mod tests {
             .unwrap_err()
         {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Value too big"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         // Decimal
@@ -1172,7 +1172,7 @@ mod tests {
             .unwrap_err()
         {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Value too big"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
         match Decimal256::from_str(
             "115792089237316195423570985008687907853269984665640564039457.584007913129639936",
@@ -1180,7 +1180,7 @@ mod tests {
         .unwrap_err()
         {
             StdError::GenericErr { msg, .. } => assert_eq!(msg, "Value too big"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -2302,13 +2302,13 @@ mod tests {
     #[test]
     fn decimal256_implements_debug() {
         let decimal = Decimal256::from_str("123.45").unwrap();
-        assert_eq!(format!("{:?}", decimal), "Decimal256(123.45)");
+        assert_eq!(format!("{decimal:?}"), "Decimal256(123.45)");
 
         let test_cases = ["5", "5.01", "42", "0", "2"];
         for s in test_cases {
             let decimal256 = Decimal256::from_str(s).unwrap();
-            let expected = format!("Decimal256({})", s);
-            assert_eq!(format!("{:?}", decimal256), expected);
+            let expected = format!("Decimal256({s})");
+            assert_eq!(format!("{decimal256:?}"), expected);
         }
     }
 }
diff --git a/packages/std/src/math/uint128.rs b/packages/std/src/math/uint128.rs
index 9c58c2cc3b..6733dfc0c0 100644
--- a/packages/std/src/math/uint128.rs
+++ b/packages/std/src/math/uint128.rs
@@ -335,7 +335,7 @@ impl FromStr for Uint128 {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s.parse::<u128>() {
             Ok(u) => Ok(Uint128(u)),
-            Err(e) => Err(StdError::generic_err(format!("Parsing u128: {}", e))),
+            Err(e) => Err(StdError::generic_err(format!("Parsing u128: {e}"))),
         }
     }
 }
@@ -581,7 +581,7 @@ impl<'de> de::Visitor<'de> for Uint128Visitor {
     {
         match v.parse::<u128>() {
             Ok(u) => Ok(Uint128(u)),
-            Err(e) => Err(E::custom(format!("invalid Uint128 '{}' - {}", v, e))),
+            Err(e) => Err(E::custom(format!("invalid Uint128 '{v}' - {e}"))),
         }
     }
 }
@@ -663,18 +663,18 @@ mod tests {
     #[test]
     fn uint128_implements_display() {
         let a = Uint128(12345);
-        assert_eq!(format!("Embedded: {}", a), "Embedded: 12345");
+        assert_eq!(format!("Embedded: {a}"), "Embedded: 12345");
         assert_eq!(a.to_string(), "12345");
 
         let a = Uint128(0);
-        assert_eq!(format!("Embedded: {}", a), "Embedded: 0");
+        assert_eq!(format!("Embedded: {a}"), "Embedded: 0");
         assert_eq!(a.to_string(), "0");
     }
 
     #[test]
     fn uint128_display_padding_works() {
         let a = Uint128::from(123u64);
-        assert_eq!(format!("Embedded: {:05}", a), "Embedded: 00123");
+        assert_eq!(format!("Embedded: {a:05}"), "Embedded: 00123");
     }
 
     #[test]
diff --git a/packages/std/src/math/uint256.rs b/packages/std/src/math/uint256.rs
index e074be4a45..d0d7fe94c9 100644
--- a/packages/std/src/math/uint256.rs
+++ b/packages/std/src/math/uint256.rs
@@ -429,7 +429,7 @@ impl FromStr for Uint256 {
 
         match U256::from_dec_str(s) {
             Ok(u) => Ok(Uint256(u)),
-            Err(e) => Err(StdError::generic_err(format!("Parsing u256: {}", e))),
+            Err(e) => Err(StdError::generic_err(format!("Parsing u256: {e}"))),
         }
     }
 }
@@ -556,8 +556,7 @@ impl Shr<u32> for Uint256 {
     fn shr(self, rhs: u32) -> Self::Output {
         self.checked_shr(rhs).unwrap_or_else(|_| {
             panic!(
-                "right shift error: {} is larger or equal than the number of bits in Uint256",
-                rhs,
+                "right shift error: {rhs} is larger or equal than the number of bits in Uint256",
             )
         })
     }
@@ -669,7 +668,7 @@ impl<'de> de::Visitor<'de> for Uint256Visitor {
     where
         E: de::Error,
     {
-        Uint256::try_from(v).map_err(|e| E::custom(format!("invalid Uint256 '{}' - {}", v, e)))
+        Uint256::try_from(v).map_err(|e| E::custom(format!("invalid Uint256 '{v}' - {e}")))
     }
 }
 
@@ -1115,18 +1114,18 @@ mod tests {
     #[test]
     fn uint256_implements_display() {
         let a = Uint256::from(12345u32);
-        assert_eq!(format!("Embedded: {}", a), "Embedded: 12345");
+        assert_eq!(format!("Embedded: {a}"), "Embedded: 12345");
         assert_eq!(a.to_string(), "12345");
 
         let a = Uint256::zero();
-        assert_eq!(format!("Embedded: {}", a), "Embedded: 0");
+        assert_eq!(format!("Embedded: {a}"), "Embedded: 0");
         assert_eq!(a.to_string(), "0");
     }
 
     #[test]
     fn uint256_display_padding_works() {
         let a = Uint256::from(123u64);
-        assert_eq!(format!("Embedded: {:05}", a), "Embedded: 00123");
+        assert_eq!(format!("Embedded: {a:05}"), "Embedded: 00123");
     }
 
     #[test]
diff --git a/packages/std/src/math/uint512.rs b/packages/std/src/math/uint512.rs
index 9b5809d3d0..a9eb33e08e 100644
--- a/packages/std/src/math/uint512.rs
+++ b/packages/std/src/math/uint512.rs
@@ -426,7 +426,7 @@ impl FromStr for Uint512 {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match U512::from_dec_str(s) {
             Ok(u) => Ok(Self(u)),
-            Err(e) => Err(StdError::generic_err(format!("Parsing u512: {}", e))),
+            Err(e) => Err(StdError::generic_err(format!("Parsing u512: {e}"))),
         }
     }
 }
@@ -537,8 +537,7 @@ impl Shr<u32> for Uint512 {
     fn shr(self, rhs: u32) -> Self::Output {
         self.checked_shr(rhs).unwrap_or_else(|_| {
             panic!(
-                "right shift error: {} is larger or equal than the number of bits in Uint512",
-                rhs,
+                "right shift error: {rhs} is larger or equal than the number of bits in Uint512",
             )
         })
     }
@@ -650,7 +649,7 @@ impl<'de> de::Visitor<'de> for Uint512Visitor {
     where
         E: de::Error,
     {
-        Uint512::try_from(v).map_err(|e| E::custom(format!("invalid Uint512 '{}' - {}", v, e)))
+        Uint512::try_from(v).map_err(|e| E::custom(format!("invalid Uint512 '{v}' - {e}")))
     }
 }
 
@@ -811,18 +810,18 @@ mod tests {
     #[test]
     fn uint512_implements_display() {
         let a = Uint512::from(12345u32);
-        assert_eq!(format!("Embedded: {}", a), "Embedded: 12345");
+        assert_eq!(format!("Embedded: {a}"), "Embedded: 12345");
         assert_eq!(a.to_string(), "12345");
 
         let a = Uint512::zero();
-        assert_eq!(format!("Embedded: {}", a), "Embedded: 0");
+        assert_eq!(format!("Embedded: {a}"), "Embedded: 0");
         assert_eq!(a.to_string(), "0");
     }
 
     #[test]
     fn uint512_display_padding_works() {
         let a = Uint512::from(123u64);
-        assert_eq!(format!("Embedded: {:05}", a), "Embedded: 00123");
+        assert_eq!(format!("Embedded: {a:05}"), "Embedded: 00123");
     }
 
     #[test]
diff --git a/packages/std/src/math/uint64.rs b/packages/std/src/math/uint64.rs
index 9afd119647..cea6cd37ff 100644
--- a/packages/std/src/math/uint64.rs
+++ b/packages/std/src/math/uint64.rs
@@ -298,7 +298,7 @@ impl TryFrom<&str> for Uint64 {
     fn try_from(val: &str) -> Result<Self, Self::Error> {
         match val.parse::<u64>() {
             Ok(u) => Ok(Uint64(u)),
-            Err(e) => Err(StdError::generic_err(format!("Parsing u64: {}", e))),
+            Err(e) => Err(StdError::generic_err(format!("Parsing u64: {e}"))),
         }
     }
 }
@@ -532,7 +532,7 @@ impl<'de> de::Visitor<'de> for Uint64Visitor {
     {
         match v.parse::<u64>() {
             Ok(u) => Ok(Uint64(u)),
-            Err(e) => Err(E::custom(format!("invalid Uint64 '{}' - {}", v, e))),
+            Err(e) => Err(E::custom(format!("invalid Uint64 '{v}' - {e}"))),
         }
     }
 }
@@ -604,18 +604,18 @@ mod tests {
     #[test]
     fn uint64_implements_display() {
         let a = Uint64(12345);
-        assert_eq!(format!("Embedded: {}", a), "Embedded: 12345");
+        assert_eq!(format!("Embedded: {a}"), "Embedded: 12345");
         assert_eq!(a.to_string(), "12345");
 
         let a = Uint64(0);
-        assert_eq!(format!("Embedded: {}", a), "Embedded: 0");
+        assert_eq!(format!("Embedded: {a}"), "Embedded: 0");
         assert_eq!(a.to_string(), "0");
     }
 
     #[test]
     fn uint64_display_padding_works() {
         let a = Uint64::from(123u64);
-        assert_eq!(format!("Embedded: {:05}", a), "Embedded: 00123");
+        assert_eq!(format!("Embedded: {a:05}"), "Embedded: 00123");
     }
 
     #[test]
diff --git a/packages/std/src/results/contract_result.rs b/packages/std/src/results/contract_result.rs
index 380ecaeccb..67956bfba3 100644
--- a/packages/std/src/results/contract_result.rs
+++ b/packages/std/src/results/contract_result.rs
@@ -132,18 +132,18 @@ mod tests {
         let parse: StdResult<ContractResult<u64>> = from_slice(br#"{"unrelated":321,"ok":4554}"#);
         match parse.unwrap_err() {
             StdError::ParseErr { .. } => {}
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
         let parse: StdResult<ContractResult<u64>> = from_slice(br#"{"ok":4554,"unrelated":321}"#);
         match parse.unwrap_err() {
             StdError::ParseErr { .. } => {}
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
         let parse: StdResult<ContractResult<u64>> =
             from_slice(br#"{"ok":4554,"error":"What's up now?"}"#);
         match parse.unwrap_err() {
             StdError::ParseErr { .. } => {}
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
diff --git a/packages/std/src/results/cosmos_msg.rs b/packages/std/src/results/cosmos_msg.rs
index 3e93ba1868..2b483a59cc 100644
--- a/packages/std/src/results/cosmos_msg.rs
+++ b/packages/std/src/results/cosmos_msg.rs
@@ -116,7 +116,7 @@ pub enum DistributionMsg {
 fn binary_to_string(data: &Binary, fmt: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
     match std::str::from_utf8(data.as_slice()) {
         Ok(s) => fmt.write_str(s),
-        Err(_) => write!(fmt, "{:?}", data),
+        Err(_) => write!(fmt, "{data:?}"),
     }
 }
 
@@ -480,7 +480,7 @@ mod tests {
         };
 
         assert_eq!(
-            format!("{:?}", msg),
+            format!("{msg:?}"),
             "Execute { contract_addr: \"joe\", msg: {\"mint\":{\"coin\":{\"denom\":\"BTC\",\"amount\":\"10\"}}}, funds: [] }"
         );
     }
@@ -494,7 +494,7 @@ mod tests {
         };
 
         assert_eq!(
-            format!("{:?}", msg),
+            format!("{msg:?}"),
             "Execute { contract_addr: \"joe\", msg: Binary(009f9296), funds: [] }"
         );
     }
diff --git a/packages/std/src/results/events.rs b/packages/std/src/results/events.rs
index 79749b00c9..31c84a9dc8 100644
--- a/packages/std/src/results/events.rs
+++ b/packages/std/src/results/events.rs
@@ -75,8 +75,7 @@ impl Attribute {
         #[cfg(debug_assertions)]
         if key.starts_with('_') {
             panic!(
-                "attribute key `{}` is invalid - keys starting with an underscore are reserved",
-                key
+                "attribute key `{key}` is invalid - keys starting with an underscore are reserved"
             );
         }
 
diff --git a/packages/std/src/results/submessages.rs b/packages/std/src/results/submessages.rs
index 138680c1e3..0a89efef1c 100644
--- a/packages/std/src/results/submessages.rs
+++ b/packages/std/src/results/submessages.rs
@@ -259,12 +259,12 @@ mod tests {
         let parse: StdResult<SubMsgResult> = from_slice(br#"{"unrelated":321,"error":"broken"}"#);
         match parse.unwrap_err() {
             StdError::ParseErr { .. } => {}
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
         let parse: StdResult<SubMsgResult> = from_slice(br#"{"error":"broken","unrelated":321}"#);
         match parse.unwrap_err() {
             StdError::ParseErr { .. } => {}
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
diff --git a/packages/std/src/storage.rs b/packages/std/src/storage.rs
index be80fcdae0..f2f099f93d 100644
--- a/packages/std/src/storage.rs
+++ b/packages/std/src/storage.rs
@@ -74,11 +74,11 @@ impl fmt::Debug for MemoryStorage {
         for (key, value) in &self.data {
             f.write_str("  0x")?;
             for byte in key {
-                write!(f, "{:02x}", byte)?;
+                write!(f, "{byte:02x}")?;
             }
             f.write_str(": 0x")?;
             for byte in value {
-                write!(f, "{:02x}", byte)?;
+                write!(f, "{byte:02x}")?;
             }
             f.write_str("\n")?;
         }
@@ -284,7 +284,7 @@ mod tests {
     fn memory_storage_implements_debug() {
         let store = MemoryStorage::new();
         assert_eq!(
-            format!("{:?}", store),
+            format!("{store:?}"),
             "MemoryStorage (0 entries) {\n\
             }"
         );
@@ -293,7 +293,7 @@ mod tests {
         let mut store = MemoryStorage::new();
         store.set(&[0x00, 0xAB, 0xDD], &[0xFF, 0xD5]);
         assert_eq!(
-            format!("{:?}", store),
+            format!("{store:?}"),
             "MemoryStorage (1 entries) {\n\
             \x20\x200x00abdd: 0xffd5\n\
             }"
@@ -305,7 +305,7 @@ mod tests {
         store.set(&[0x00, 0xAB, 0xEE], &[0xFF, 0xD5]);
         store.set(&[0x00, 0xAB, 0xCC], &[0xFF, 0xD5]);
         assert_eq!(
-            format!("{:?}", store),
+            format!("{store:?}"),
             "MemoryStorage (3 entries) {\n\
             \x20\x200x00abcc: 0xffd5\n\
             \x20\x200x00abdd: 0xffd5\n\
@@ -320,7 +320,7 @@ mod tests {
         store.set(&[0xAA, 0xBB, 0xCC], &[0x11, 0x22, 0x33]);
         store.set(&[0xAA, 0xBB, 0xCC, 0xDD], &[0x11, 0x22, 0x33, 0x44]);
         assert_eq!(
-            format!("{:?}", store),
+            format!("{store:?}"),
             "MemoryStorage (4 entries) {\n\
             \x20\x200xaa: 0x11\n\
             \x20\x200xaabb: 0x1122\n\
diff --git a/packages/std/src/testing/assertions.rs b/packages/std/src/testing/assertions.rs
index 3d5cf0a2d8..bac91d0138 100644
--- a/packages/std/src/testing/assertions.rs
+++ b/packages/std/src/testing/assertions.rs
@@ -41,12 +41,10 @@ pub fn assert_approx_eq_impl<U: Into<Uint128>>(
     if rel_diff > max_rel_diff {
         match panic_msg {
             Some(panic_msg) => panic!(
-                "assertion failed: `(left ≈ right)`\nleft: {}\nright: {}\nrelative difference: {}\nmax allowed relative difference: {}\n: {}",
-                left, right, rel_diff, max_rel_diff, panic_msg
+                "assertion failed: `(left ≈ right)`\nleft: {left}\nright: {right}\nrelative difference: {rel_diff}\nmax allowed relative difference: {max_rel_diff}\n: {panic_msg}"
             ),
             None => panic!(
-                "assertion failed: `(left ≈ right)`\nleft: {}\nright: {}\nrelative difference: {}\nmax allowed relative difference: {}\n",
-                left, right, rel_diff, max_rel_diff
+                "assertion failed: `(left ≈ right)`\nleft: {left}\nright: {right}\nrelative difference: {rel_diff}\nmax allowed relative difference: {max_rel_diff}\n"
             ),
         }
     }
diff --git a/packages/std/src/testing/mock.rs b/packages/std/src/testing/mock.rs
index 3b5ce6f253..375d0c86dc 100644
--- a/packages/std/src/testing/mock.rs
+++ b/packages/std/src/testing/mock.rs
@@ -233,7 +233,7 @@ impl Api for MockApi {
     }
 
     fn debug(&self, message: &str) {
-        println!("{}", message);
+        println!("{message}");
     }
 }
 
@@ -527,7 +527,7 @@ impl<C: CustomQuery + DeserializeOwned> Querier for MockQuerier<C> {
             Ok(v) => v,
             Err(e) => {
                 return SystemResult::Err(SystemError::InvalidRequest {
-                    error: format!("Parsing query request: {}", e),
+                    error: format!("Parsing query request: {e}"),
                     request: bin_request.into(),
                 })
             }
@@ -1100,7 +1100,7 @@ mod tests {
         let result = api.secp256k1_recover_pubkey(&hash, &signature, 42);
         match result.unwrap_err() {
             RecoverPubkeyError::InvalidRecoveryParam => {}
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
@@ -1129,7 +1129,7 @@ mod tests {
         let result = api.secp256k1_recover_pubkey(&malformed_hash, &signature, recovery_param);
         match result.unwrap_err() {
             RecoverPubkeyError::InvalidHashFormat => {}
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
@@ -1750,7 +1750,7 @@ mod tests {
             .unwrap_err();
         match system_err {
             SystemError::NoSuchContract { addr } => assert_eq!(addr, any_addr),
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
 
         // By default, querier errors for WasmQuery::Smart
@@ -1762,7 +1762,7 @@ mod tests {
             .unwrap_err();
         match system_err {
             SystemError::NoSuchContract { addr } => assert_eq!(addr, any_addr),
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
 
         // By default, querier errors for WasmQuery::ContractInfo
@@ -1773,7 +1773,7 @@ mod tests {
             .unwrap_err();
         match system_err {
             SystemError::NoSuchContract { addr } => assert_eq!(addr, any_addr),
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
 
         #[cfg(feature = "cosmwasm_1_2")]
@@ -1784,7 +1784,7 @@ mod tests {
                 .unwrap_err();
             match system_err {
                 SystemError::NoSuchCode { code_id } => assert_eq!(code_id, 4),
-                err => panic!("Unexpected error: {:?}", err),
+                err => panic!("Unexpected error: {err:?}"),
             }
         }
 
@@ -1869,7 +1869,7 @@ mod tests {
         });
         match result {
             SystemResult::Ok(ContractResult::Ok(value)) => assert_eq!(value, b"the value" as &[u8]),
-            res => panic!("Unexpected result: {:?}", res),
+            res => panic!("Unexpected result: {res:?}"),
         }
         let result = querier.query(&WasmQuery::Raw {
             contract_addr: "contract1".into(),
@@ -1877,7 +1877,7 @@ mod tests {
         });
         match result {
             SystemResult::Ok(ContractResult::Ok(value)) => assert_eq!(value, b"" as &[u8]),
-            res => panic!("Unexpected result: {:?}", res),
+            res => panic!("Unexpected result: {res:?}"),
         }
 
         // WasmQuery::Smart
@@ -1890,7 +1890,7 @@ mod tests {
                 value,
                 br#"{"messages":[],"attributes":[],"events":[],"data":"Z29vZA=="}"# as &[u8]
             ),
-            res => panic!("Unexpected result: {:?}", res),
+            res => panic!("Unexpected result: {res:?}"),
         }
         let result = querier.query(&WasmQuery::Smart {
             contract_addr: "contract1".into(),
@@ -1900,7 +1900,7 @@ mod tests {
             SystemResult::Ok(ContractResult::Err(err)) => {
                 assert_eq!(err, "Error parsing into type cosmwasm_std::testing::mock::tests::wasm_querier_works::{{closure}}::MyMsg: Invalid type")
             }
-            res => panic!("Unexpected result: {:?}", res),
+            res => panic!("Unexpected result: {res:?}"),
         }
 
         // WasmQuery::ContractInfo
@@ -1913,7 +1913,7 @@ mod tests {
                 br#"{"code_id":4,"creator":"lalala","admin":null,"pinned":false,"ibc_port":null}"#
                     as &[u8]
             ),
-            res => panic!("Unexpected result: {:?}", res),
+            res => panic!("Unexpected result: {res:?}"),
         }
 
         // WasmQuery::ContractInfo
@@ -1925,7 +1925,7 @@ mod tests {
                     value,
                     br#"{"code_id":4,"creator":"lalala","checksum":"84cf20810fd429caf58898c3210fcb71759a27becddae08dbde8668ea2f4725d"}"#
                 ),
-                res => panic!("Unexpected result: {:?}", res),
+                res => panic!("Unexpected result: {res:?}"),
             }
         }
     }
diff --git a/packages/std/src/timestamp.rs b/packages/std/src/timestamp.rs
index 61c363e5d7..7a3c4314c1 100644
--- a/packages/std/src/timestamp.rs
+++ b/packages/std/src/timestamp.rs
@@ -120,7 +120,7 @@ impl fmt::Display for Timestamp {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let whole = self.seconds();
         let fractional = self.subsec_nanos();
-        write!(f, "{}.{:09}", whole, fractional)
+        write!(f, "{whole}.{fractional:09}")
     }
 }
 
diff --git a/packages/std/src/traits.rs b/packages/std/src/traits.rs
index 7181036cb8..c0442d0ed9 100644
--- a/packages/std/src/traits.rs
+++ b/packages/std/src/traits.rs
@@ -196,15 +196,14 @@ impl<'a, C: CustomQuery> QuerierWrapper<'a, C> {
     /// eg. If you don't differentiate between contract missing and contract returned error
     pub fn query<U: DeserializeOwned>(&self, request: &QueryRequest<C>) -> StdResult<U> {
         let raw = to_vec(request).map_err(|serialize_err| {
-            StdError::generic_err(format!("Serializing QueryRequest: {}", serialize_err))
+            StdError::generic_err(format!("Serializing QueryRequest: {serialize_err}"))
         })?;
         match self.raw_query(&raw) {
             SystemResult::Err(system_err) => Err(StdError::generic_err(format!(
-                "Querier system error: {}",
-                system_err
+                "Querier system error: {system_err}"
             ))),
             SystemResult::Ok(ContractResult::Err(contract_err)) => Err(StdError::generic_err(
-                format!("Querier contract error: {}", contract_err),
+                format!("Querier contract error: {contract_err}"),
             )),
             SystemResult::Ok(ContractResult::Ok(value)) => from_binary(&value),
         }
@@ -300,15 +299,14 @@ impl<'a, C: CustomQuery> QuerierWrapper<'a, C> {
         // we cannot use query, as it will try to parse the binary data, when we just want to return it,
         // so a bit of code copy here...
         let raw = to_vec(&request).map_err(|serialize_err| {
-            StdError::generic_err(format!("Serializing QueryRequest: {}", serialize_err))
+            StdError::generic_err(format!("Serializing QueryRequest: {serialize_err}"))
         })?;
         match self.raw_query(&raw) {
             SystemResult::Err(system_err) => Err(StdError::generic_err(format!(
-                "Querier system error: {}",
-                system_err
+                "Querier system error: {system_err}"
             ))),
             SystemResult::Ok(ContractResult::Err(contract_err)) => Err(StdError::generic_err(
-                format!("Querier contract error: {}", contract_err),
+                format!("Querier contract error: {contract_err}"),
             )),
             SystemResult::Ok(ContractResult::Ok(value)) => {
                 if value.is_empty() {
diff --git a/packages/storage/src/bucket.rs b/packages/storage/src/bucket.rs
index c349f1edd5..a870dfac4d 100644
--- a/packages/storage/src/bucket.rs
+++ b/packages/storage/src/bucket.rs
@@ -409,7 +409,7 @@ mod tests {
         });
         match res.unwrap_err() {
             MyError::NotFound { .. } => {}
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
diff --git a/packages/storage/src/singleton.rs b/packages/storage/src/singleton.rs
index c274a41dc8..3d5e5c9567 100644
--- a/packages/storage/src/singleton.rs
+++ b/packages/storage/src/singleton.rs
@@ -271,7 +271,7 @@ mod tests {
         });
         match output.unwrap_err() {
             StdError::Overflow { .. } => {}
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
         assert_eq!(writer.load().unwrap(), cfg);
     }
@@ -314,7 +314,7 @@ mod tests {
         });
         match res.unwrap_err() {
             MyError::Std(StdError::GenericErr { .. }) => {}
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
         assert_eq!(writer.load().unwrap(), cfg);
     }
diff --git a/packages/storage/src/type_helpers.rs b/packages/storage/src/type_helpers.rs
index 6a36f074e2..233d2b1463 100644
--- a/packages/storage/src/type_helpers.rs
+++ b/packages/storage/src/type_helpers.rs
@@ -83,7 +83,7 @@ mod tests {
             StdError::NotFound { kind, .. } => {
                 assert_eq!(kind, "cosmwasm_storage::type_helpers::tests::Person")
             }
-            e => panic!("Unexpected error {}", e),
+            e => panic!("Unexpected error {e}"),
         }
     }
 }
diff --git a/packages/vm/benches/main.rs b/packages/vm/benches/main.rs
index 59f46c6836..e0911e3804 100644
--- a/packages/vm/benches/main.rs
+++ b/packages/vm/benches/main.rs
@@ -112,7 +112,7 @@ fn bench_instance(c: &mut Criterion) {
             assert!(contract_result.into_result().is_ok());
             gas_used = gas_before - instance.get_gas_left();
         });
-        println!("Gas used: {}", gas_used);
+        println!("Gas used: {gas_used}");
     });
 
     group.finish();
diff --git a/packages/vm/examples/module_size.rs b/packages/vm/examples/module_size.rs
index 162149fd5a..bf35894718 100644
--- a/packages/vm/examples/module_size.rs
+++ b/packages/vm/examples/module_size.rs
@@ -32,7 +32,7 @@ pub fn main() {
 
     // Report wasm size
     let wasm_size = wasm.len();
-    println!("wasm size: {} bytes", wasm_size);
+    println!("wasm size: {wasm_size} bytes");
 
     // Compile module
     let module = module_compile(&wasm);
@@ -49,7 +49,7 @@ pub fn main() {
     let serialized = module.serialize().unwrap();
     mem::drop(module);
     let ser_size = serialized.len();
-    println!("module size (serialized): {} bytes", ser_size);
+    println!("module size (serialized): {ser_size} bytes");
     println!(
         "(serialized) module size ratio: {:.2}",
         ser_size as f32 / wasm_size as f32
diff --git a/packages/vm/examples/multi_threaded_cache.rs b/packages/vm/examples/multi_threaded_cache.rs
index 71a7ba944f..7be56be405 100644
--- a/packages/vm/examples/multi_threaded_cache.rs
+++ b/packages/vm/examples/multi_threaded_cache.rs
@@ -44,7 +44,7 @@ pub fn main() {
 
         threads.push(thread::spawn(move || {
             let checksum = cache.save_wasm(CONTRACT).unwrap();
-            println!("Done saving Wasm {}", checksum);
+            println!("Done saving Wasm {checksum}");
         }));
     }
     for i in 0..INSTANTIATION_THREADS {
diff --git a/packages/vm/src/backend.rs b/packages/vm/src/backend.rs
index ea9a085007..0128847a65 100644
--- a/packages/vm/src/backend.rs
+++ b/packages/vm/src/backend.rs
@@ -304,7 +304,7 @@ mod tests {
         let error = BackendError::foreign_panic();
         match error {
             BackendError::ForeignPanic { .. } => {}
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -313,7 +313,7 @@ mod tests {
         let error = BackendError::bad_argument();
         match error {
             BackendError::BadArgument { .. } => {}
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -322,7 +322,7 @@ mod tests {
         let error = BackendError::iterator_does_not_exist(15);
         match error {
             BackendError::IteratorDoesNotExist { id, .. } => assert_eq!(id, 15),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -331,7 +331,7 @@ mod tests {
         let error = BackendError::out_of_gas();
         match error {
             BackendError::OutOfGas { .. } => {}
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -340,7 +340,7 @@ mod tests {
         let error = BackendError::unknown("broken");
         match error {
             BackendError::Unknown { msg, .. } => assert_eq!(msg, "broken"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -349,7 +349,7 @@ mod tests {
         let error = BackendError::user_err("invalid input");
         match error {
             BackendError::UserErr { msg, .. } => assert_eq!(msg, "invalid input"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -360,7 +360,7 @@ mod tests {
         let error: BackendError = String::from_utf8(vec![0x80]).unwrap_err().into();
         match error {
             BackendError::InvalidUtf8 { .. } => {}
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 }
diff --git a/packages/vm/src/cache.rs b/packages/vm/src/cache.rs
index 1a1117ffc9..38772a2728 100644
--- a/packages/vm/src/cache.rs
+++ b/packages/vm/src/cache.rs
@@ -127,7 +127,7 @@ where
         mkdir_p(&wasm_path).map_err(|_e| VmError::cache_err("Error creating wasm directory"))?;
 
         let fs_cache = FileSystemCache::new(cache_path.join(MODULES_DIR), false)
-            .map_err(|e| VmError::cache_err(format!("Error file system cache: {}", e)))?;
+            .map_err(|e| VmError::cache_err(format!("Error file system cache: {e}")))?;
         Ok(Cache {
             available_capabilities,
             inner: Mutex::new(CacheInner {
@@ -411,9 +411,9 @@ fn save_wasm_to_disk(dir: impl Into<PathBuf>, wasm: &[u8]) -> VmResult<Checksum>
         .write(true)
         .create(true)
         .open(filepath)
-        .map_err(|e| VmError::cache_err(format!("Error opening Wasm file for writing: {}", e)))?;
+        .map_err(|e| VmError::cache_err(format!("Error opening Wasm file for writing: {e}")))?;
     file.write_all(wasm)
-        .map_err(|e| VmError::cache_err(format!("Error writing Wasm file: {}", e)))?;
+        .map_err(|e| VmError::cache_err(format!("Error writing Wasm file: {e}")))?;
 
     Ok(checksum)
 }
@@ -559,7 +559,7 @@ mod tests {
             VmError::StaticValidationErr { msg, .. } => {
                 assert_eq!(msg, "Wasm contract doesn\'t have a memory section")
             }
-            e => panic!("Unexpected error {:?}", e),
+            e => panic!("Unexpected error {e:?}"),
         }
     }
 
@@ -651,7 +651,7 @@ mod tests {
             VmError::CacheErr { msg, .. } => {
                 assert_eq!(msg, "Error opening Wasm file for reading")
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -681,7 +681,7 @@ mod tests {
         let res = cache.load_wasm(&checksum);
         match res {
             Err(VmError::IntegrityErr { .. }) => {}
-            Err(e) => panic!("Unexpected error: {:?}", e),
+            Err(e) => panic!("Unexpected error: {e:?}"),
             Ok(_) => panic!("This must not succeed"),
         }
     }
@@ -705,7 +705,7 @@ mod tests {
             VmError::CacheErr { msg, .. } => {
                 assert_eq!(msg, "Error opening Wasm file for reading")
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
 
         // Removing again fails
@@ -713,7 +713,7 @@ mod tests {
             VmError::CacheErr { msg, .. } => {
                 assert_eq!(msg, "Wasm file does not exist")
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -1066,7 +1066,7 @@ mod tests {
             .unwrap_err()
         {
             VmError::GasDepletion { .. } => (), // all good, continue
-            e => panic!("unexpected error, {:?}", e),
+            e => panic!("unexpected error, {e:?}"),
         }
         assert_eq!(instance1.get_gas_left(), 0);
 
@@ -1145,7 +1145,7 @@ mod tests {
 
         match remove_wasm_from_disk(path, &checksum).unwrap_err() {
             VmError::CacheErr { msg } => assert_eq!(msg, "Wasm file does not exist"),
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
diff --git a/packages/vm/src/calls.rs b/packages/vm/src/calls.rs
index 2da5e3ea39..d55389c16a 100644
--- a/packages/vm/src/calls.rs
+++ b/packages/vm/src/calls.rs
@@ -207,7 +207,7 @@ where
     // Ensure query response is valid JSON
     if let ContractResult::Ok(binary_response) = &result {
         serde_json::from_slice::<serde_json::Value>(binary_response.as_slice()).map_err(|e| {
-            VmError::generic_err(format!("Query response must be valid JSON. {}", e))
+            VmError::generic_err(format!("Query response must be valid JSON. {e}"))
         })?;
     }
 
@@ -666,7 +666,7 @@ mod tests {
                     "RuntimeError: Aborted: panicked at 'This page intentionally faulted'"
                 ))
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
@@ -688,7 +688,7 @@ mod tests {
             VmError::RuntimeErr { msg } => {
                 assert!(msg.contains("RuntimeError: unreachable"))
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
diff --git a/packages/vm/src/checksum.rs b/packages/vm/src/checksum.rs
index 05d2aa88b1..c6aefc3fa9 100644
--- a/packages/vm/src/checksum.rs
+++ b/packages/vm/src/checksum.rs
@@ -28,7 +28,7 @@ impl Checksum {
 impl fmt::Display for Checksum {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         for byte in self.0.iter() {
-            write!(f, "{:02x}", byte)?;
+            write!(f, "{byte:02x}")?;
         }
         Ok(())
     }
@@ -82,7 +82,7 @@ mod tests {
         let wasm = vec![0x68, 0x69, 0x6a];
         let checksum = Checksum::generate(&wasm);
         // echo -n "hij" | sha256sum
-        let embedded = format!("Check: {}", checksum);
+        let embedded = format!("Check: {checksum}");
         assert_eq!(
             embedded,
             "Check: 722c8c993fd75a7627d69ed941344fe2a1423a3e75efd3e6778a142884227104"
diff --git a/packages/vm/src/compatibility.rs b/packages/vm/src/compatibility.rs
index 428d51554f..a5284a6e2e 100644
--- a/packages/vm/src/compatibility.rs
+++ b/packages/vm/src/compatibility.rs
@@ -137,8 +137,7 @@ fn check_wasm_memories(module: &Module) -> VmResult<()> {
 
     if limits.initial() > MEMORY_LIMIT {
         return Err(VmError::static_validation_err(format!(
-            "Wasm contract memory's minimum must not exceed {} pages.",
-            MEMORY_LIMIT
+            "Wasm contract memory's minimum must not exceed {MEMORY_LIMIT} pages."
         )));
     }
 
@@ -185,8 +184,7 @@ fn check_wasm_exports(module: &Module) -> VmResult<()> {
     for required_export in REQUIRED_EXPORTS {
         if !available_exports.contains(*required_export) {
             return Err(VmError::static_validation_err(format!(
-                "Wasm contract doesn't have required export: \"{}\". Exports required by VM: {:?}.",
-                required_export, REQUIRED_EXPORTS
+                "Wasm contract doesn't have required export: \"{required_export}\". Exports required by VM: {REQUIRED_EXPORTS:?}."
             )));
         }
     }
@@ -223,8 +221,7 @@ fn check_wasm_imports(module: &Module, supported_imports: &[&str]) -> VmResult<(
         match required_import.external() {
             External::Function(_) => {}, // ok
             _ => return Err(VmError::static_validation_err(format!(
-                "Wasm contract requires non-function import: \"{}\". Right now, all supported imports are functions.",
-                full_name
+                "Wasm contract requires non-function import: \"{full_name}\". Right now, all supported imports are functions."
             ))),
         };
     }
@@ -281,7 +278,7 @@ mod tests {
                 msg,
                 "Wasm contract has unknown interface_version_* marker export (see https://github.com/CosmWasm/cosmwasm/blob/main/packages/vm/README.md)"
             ),
-            Err(e) => panic!("Unexpected error {:?}", e),
+            Err(e) => panic!("Unexpected error {e:?}"),
             Ok(_) => panic!("This must not succeeed"),
         };
 
@@ -290,7 +287,7 @@ mod tests {
                 msg,
                 "Wasm contract has unknown interface_version_* marker export (see https://github.com/CosmWasm/cosmwasm/blob/main/packages/vm/README.md)"
             ),
-            Err(e) => panic!("Unexpected error {:?}", e),
+            Err(e) => panic!("Unexpected error {e:?}"),
             Ok(_) => panic!("This must not succeeed"),
         };
 
@@ -299,7 +296,7 @@ mod tests {
                 msg,
                 "Wasm contract missing a required marker export: interface_version_*"
             ),
-            Err(e) => panic!("Unexpected error {:?}", e),
+            Err(e) => panic!("Unexpected error {e:?}"),
             Ok(_) => panic!("This must not succeeed"),
         };
 
@@ -308,7 +305,7 @@ mod tests {
                 msg,
                 "Wasm contract missing a required marker export: interface_version_*"
             ),
-            Err(e) => panic!("Unexpected error {:?}", e),
+            Err(e) => panic!("Unexpected error {e:?}"),
             Ok(_) => panic!("This must not succeeed"),
         };
     }
@@ -358,7 +355,7 @@ mod tests {
             Err(VmError::StaticValidationErr { msg, .. }) => {
                 assert!(msg.starts_with("Wasm contract doesn't have a memory section"));
             }
-            Err(e) => panic!("Unexpected error {:?}", e),
+            Err(e) => panic!("Unexpected error {e:?}"),
             Ok(_) => panic!("Didn't reject wasm with invalid api"),
         }
     }
@@ -382,7 +379,7 @@ mod tests {
             Err(VmError::StaticValidationErr { msg, .. }) => {
                 assert!(msg.starts_with("Wasm contract must contain exactly one memory"));
             }
-            Err(e) => panic!("Unexpected error {:?}", e),
+            Err(e) => panic!("Unexpected error {e:?}"),
             Ok(_) => panic!("Didn't reject wasm with invalid api"),
         }
     }
@@ -403,7 +400,7 @@ mod tests {
             Err(VmError::StaticValidationErr { msg, .. }) => {
                 assert!(msg.starts_with("Wasm contract must contain exactly one memory"));
             }
-            Err(e) => panic!("Unexpected error {:?}", e),
+            Err(e) => panic!("Unexpected error {e:?}"),
             Ok(_) => panic!("Didn't reject wasm with invalid api"),
         }
     }
@@ -418,7 +415,7 @@ mod tests {
             Err(VmError::StaticValidationErr { msg, .. }) => {
                 assert!(msg.starts_with("Wasm contract memory's minimum must not exceed 512 pages"));
             }
-            Err(e) => panic!("Unexpected error {:?}", e),
+            Err(e) => panic!("Unexpected error {e:?}"),
             Ok(_) => panic!("Didn't reject wasm with invalid api"),
         }
     }
@@ -430,7 +427,7 @@ mod tests {
             Err(VmError::StaticValidationErr { msg, .. }) => {
                 assert!(msg.starts_with("Wasm contract memory's maximum must be unset"));
             }
-            Err(e) => panic!("Unexpected error {:?}", e),
+            Err(e) => panic!("Unexpected error {e:?}"),
             Ok(_) => panic!("Didn't reject wasm with invalid api"),
         }
     }
@@ -492,7 +489,7 @@ mod tests {
                     "Wasm contract missing a required marker export: interface_version_*"
                 );
             }
-            err => panic!("Unexpected error {:?}", err),
+            err => panic!("Unexpected error {err:?}"),
         }
 
         // multiple
@@ -517,7 +514,7 @@ mod tests {
                     "Wasm contract contains more than one marker export: interface_version_*"
                 );
             }
-            err => panic!("Unexpected error {:?}", err),
+            err => panic!("Unexpected error {err:?}"),
         }
 
         // CosmWasm 0.15
@@ -538,7 +535,7 @@ mod tests {
             VmError::StaticValidationErr { msg, .. } => {
                 assert_eq!(msg, "Wasm contract has unknown interface_version_* marker export (see https://github.com/CosmWasm/cosmwasm/blob/main/packages/vm/README.md)");
             }
-            err => panic!("Unexpected error {:?}", err),
+            err => panic!("Unexpected error {err:?}"),
         }
 
         // Unknown value
@@ -559,7 +556,7 @@ mod tests {
             VmError::StaticValidationErr { msg, .. } => {
                 assert_eq!(msg, "Wasm contract has unknown interface_version_* marker export (see https://github.com/CosmWasm/cosmwasm/blob/main/packages/vm/README.md)");
             }
-            err => panic!("Unexpected error {:?}", err),
+            err => panic!("Unexpected error {err:?}"),
         }
     }
 
@@ -594,7 +591,7 @@ mod tests {
             Err(VmError::StaticValidationErr { msg, .. }) => {
                 assert!(msg.starts_with("Wasm contract doesn't have required export: \"allocate\""));
             }
-            Err(e) => panic!("Unexpected error {:?}", e),
+            Err(e) => panic!("Unexpected error {e:?}"),
             Ok(_) => panic!("Didn't reject wasm with invalid api"),
         }
 
@@ -615,7 +612,7 @@ mod tests {
                     msg.starts_with("Wasm contract doesn't have required export: \"deallocate\"")
                 );
             }
-            Err(e) => panic!("Unexpected error {:?}", e),
+            Err(e) => panic!("Unexpected error {e:?}"),
             Ok(_) => panic!("Didn't reject wasm with invalid api"),
         }
     }
@@ -629,7 +626,7 @@ mod tests {
                     msg.starts_with("Wasm contract doesn't have required export: \"instantiate\"")
                 )
             }
-            Err(e) => panic!("Unexpected error {:?}", e),
+            Err(e) => panic!("Unexpected error {e:?}"),
             Ok(_) => panic!("Didn't reject wasm with invalid api"),
         }
     }
@@ -768,7 +765,7 @@ mod tests {
             VmError::StaticValidationErr { msg, .. } => {
                 assert_eq!(msg, "Import count exceeds limit. Imports: 101. Limit: 100.");
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
@@ -803,13 +800,13 @@ mod tests {
         let result = check_wasm_imports(&deserialize_wasm(&wasm).unwrap(), supported_imports);
         match result.unwrap_err() {
             VmError::StaticValidationErr { msg, .. } => {
-                println!("{}", msg);
+                println!("{msg}");
                 assert_eq!(
                     msg,
                     r#"Wasm contract requires unsupported import: "env.foo". Required imports: {"env.bar", "env.foo", "env.spammyspam01", "env.spammyspam02", "env.spammyspam03", "env.spammyspam04", "env.spammyspam05", "env.spammyspam06", "env.spammyspam07", "env.spammyspam08", ... 2 more}. Available imports: ["env.db_read", "env.db_write", "env.db_remove", "env.addr_canonicalize", "env.addr_humanize", "env.debug", "env.query_chain"]."#
                 );
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
@@ -823,7 +820,7 @@ mod tests {
                     msg.starts_with("Wasm contract requires unsupported import: \"env.read_db\"")
                 );
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
@@ -837,7 +834,7 @@ mod tests {
                     msg.starts_with("Wasm contract requires non-function import: \"env.db_read\"")
                 );
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
diff --git a/packages/vm/src/conversion.rs b/packages/vm/src/conversion.rs
index 8723cd0ebe..ef9577c4af 100644
--- a/packages/vm/src/conversion.rs
+++ b/packages/vm/src/conversion.rs
@@ -53,7 +53,7 @@ mod tests {
                 assert_eq!(to_type, "u32");
                 assert_eq!(input, "4294967296");
             }
-            Err(err) => panic!("unexpected error: {:?}", err),
+            Err(err) => panic!("unexpected error: {err:?}"),
             Ok(_) => panic!("must not succeed"),
         };
     }
@@ -77,7 +77,7 @@ mod tests {
                 assert_eq!(to_type, "u32");
                 assert_eq!(input, "4294967296");
             }
-            Err(err) => panic!("unexpected error: {:?}", err),
+            Err(err) => panic!("unexpected error: {err:?}"),
             Ok(_) => panic!("must not succeed"),
         };
     }
@@ -99,7 +99,7 @@ mod tests {
                 assert_eq!(to_type, "u32");
                 assert_eq!(input, "-1");
             }
-            Err(err) => panic!("unexpected error: {:?}", err),
+            Err(err) => panic!("unexpected error: {err:?}"),
             Ok(_) => panic!("must not succeed"),
         };
     }
@@ -121,7 +121,7 @@ mod tests {
                 assert_eq!(to_type, "u32");
                 assert_eq!(input, "-1");
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         };
 
         // usize
@@ -141,7 +141,7 @@ mod tests {
                 assert_eq!(to_type, "u32");
                 assert_eq!(input, "4294967296");
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         };
     }
 
@@ -162,7 +162,7 @@ mod tests {
                 assert_eq!(to_type, "i32");
                 assert_eq!(input, "2147483648");
             }
-            Err(err) => panic!("unexpected error: {:?}", err),
+            Err(err) => panic!("unexpected error: {err:?}"),
             Ok(_) => panic!("must not succeed"),
         };
     }
@@ -188,7 +188,7 @@ mod tests {
                 assert_eq!(to_type, "i32");
                 assert_eq!(input, "-2147483649");
             }
-            Err(err) => panic!("unexpected error: {:?}", err),
+            Err(err) => panic!("unexpected error: {err:?}"),
             Ok(_) => panic!("must not succeed"),
         };
     }
diff --git a/packages/vm/src/environment.rs b/packages/vm/src/environment.rs
index 43dc652384..202cedd99a 100644
--- a/packages/vm/src/environment.rs
+++ b/packages/vm/src/environment.rs
@@ -562,7 +562,7 @@ mod tests {
         // Using one more unit of gas triggers a failure
         match process_gas_info(&env, &mut store, GasInfo::with_cost(1)).unwrap_err() {
             VmError::GasDepletion { .. } => {}
-            err => panic!("unexpected error: {:?}", err),
+            err => panic!("unexpected error: {err:?}"),
         }
     }
 
@@ -584,7 +584,7 @@ mod tests {
         // Using one more unit of gas triggers a failure
         match process_gas_info(&env, &mut store, GasInfo::with_externally_used(1)).unwrap_err() {
             VmError::GasDepletion { .. } => {}
-            err => panic!("unexpected error: {:?}", err),
+            err => panic!("unexpected error: {err:?}"),
         }
     }
 
@@ -617,7 +617,7 @@ mod tests {
         // More cost fail but do not change stats
         match process_gas_info(&env, &mut store, GasInfo::new(1, 0)).unwrap_err() {
             VmError::GasDepletion { .. } => {}
-            err => panic!("unexpected error: {:?}", err),
+            err => panic!("unexpected error: {err:?}"),
         }
         assert_eq!(env.get_gas_left(&mut store), 0);
         let gas_state = env.with_gas_state(|gas_state| gas_state.clone());
@@ -627,7 +627,7 @@ mod tests {
         // More externally used fails and changes stats
         match process_gas_info(&env, &mut store, GasInfo::new(0, 1)).unwrap_err() {
             VmError::GasDepletion { .. } => {}
-            err => panic!("unexpected error: {:?}", err),
+            err => panic!("unexpected error: {err:?}"),
         }
         assert_eq!(env.get_gas_left(&mut store), 0);
         let gas_state = env.with_gas_state(|gas_state| gas_state.clone());
@@ -643,7 +643,7 @@ mod tests {
             let result = process_gas_info(&env, &mut store, GasInfo::with_externally_used(120));
             match result.unwrap_err() {
                 VmError::GasDepletion { .. } => {}
-                err => panic!("unexpected error: {:?}", err),
+                err => panic!("unexpected error: {err:?}"),
             }
             assert_eq!(env.get_gas_left(&mut store), 0);
             let gas_state = env.with_gas_state(|gas_state| gas_state.clone());
@@ -657,7 +657,7 @@ mod tests {
             let result = process_gas_info(&env, &mut store, GasInfo::with_cost(120));
             match result.unwrap_err() {
                 VmError::GasDepletion { .. } => {}
-                err => panic!("unexpected error: {:?}", err),
+                err => panic!("unexpected error: {err:?}"),
             }
             assert_eq!(env.get_gas_left(&mut store), 0);
             let gas_state = env.with_gas_state(|gas_state| gas_state.clone());
@@ -689,7 +689,7 @@ mod tests {
         // Using one more unit of gas triggers a failure
         match process_gas_info(&env, &mut store, GasInfo::with_externally_used(1)).unwrap_err() {
             VmError::GasDepletion { .. } => {}
-            err => panic!("unexpected error: {:?}", err),
+            err => panic!("unexpected error: {err:?}"),
         }
     }
 
@@ -742,7 +742,7 @@ mod tests {
         let res = env.call_function(&mut store, "allocate", &[]);
         match res.unwrap_err() {
             VmError::UninitializedContextData { kind, .. } => assert_eq!(kind, "wasmer_instance"),
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
@@ -756,7 +756,7 @@ mod tests {
             VmError::ResolveErr { msg, .. } => {
                 assert_eq!(msg, "Could not get export: Missing export doesnt_exist");
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
@@ -786,7 +786,7 @@ mod tests {
                 assert_eq!(expected, 0);
                 assert_eq!(actual, 1);
             }
-            err => panic!("unexpected error: {:?}", err),
+            err => panic!("unexpected error: {err:?}"),
         }
     }
 
@@ -825,7 +825,7 @@ mod tests {
                 assert_eq!(expected, 1);
                 assert_eq!(actual, 0);
             }
-            err => panic!("unexpected error: {:?}", err),
+            err => panic!("unexpected error: {err:?}"),
         }
     }
 
diff --git a/packages/vm/src/errors/communication_error.rs b/packages/vm/src/errors/communication_error.rs
index 263980efba..f298a46d3c 100644
--- a/packages/vm/src/errors/communication_error.rs
+++ b/packages/vm/src/errors/communication_error.rs
@@ -97,7 +97,7 @@ mod tests {
                 assert_eq!(offset, 345);
                 assert_eq!(msg, "broken stuff");
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -106,7 +106,7 @@ mod tests {
         let error = CommunicationError::invalid_order(-745);
         match error {
             CommunicationError::InvalidOrder { value, .. } => assert_eq!(value, -745),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -115,7 +115,7 @@ mod tests {
         let error = CommunicationError::invalid_utf8("broken");
         match error {
             CommunicationError::InvalidUtf8 { msg, .. } => assert_eq!(msg, "broken"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -129,7 +129,7 @@ mod tests {
                 assert_eq!(length, 50);
                 assert_eq!(max_length, 20);
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -141,7 +141,7 @@ mod tests {
                 assert_eq!(size, 12);
                 assert_eq!(required, 33);
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -150,7 +150,7 @@ mod tests {
         let error = CommunicationError::zero_address();
         match error {
             CommunicationError::ZeroAddress { .. } => {}
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 }
diff --git a/packages/vm/src/errors/region_validation_error.rs b/packages/vm/src/errors/region_validation_error.rs
index 7fc407e7c0..bf9dd5e360 100644
--- a/packages/vm/src/errors/region_validation_error.rs
+++ b/packages/vm/src/errors/region_validation_error.rs
@@ -51,7 +51,7 @@ mod tests {
                 assert_eq!(length, 50);
                 assert_eq!(capacity, 20);
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -65,7 +65,7 @@ mod tests {
                 assert_eq!(offset, u32::MAX);
                 assert_eq!(capacity, 1);
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -74,7 +74,7 @@ mod tests {
         let error = RegionValidationError::zero_offset();
         match error {
             RegionValidationError::ZeroOffset { .. } => {}
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 }
diff --git a/packages/vm/src/errors/vm_error.rs b/packages/vm/src/errors/vm_error.rs
index 51f472cf7d..ed7adc6674 100644
--- a/packages/vm/src/errors/vm_error.rs
+++ b/packages/vm/src/errors/vm_error.rs
@@ -345,19 +345,19 @@ impl From<CryptoError> for VmError {
 
 impl From<wasmer::ExportError> for VmError {
     fn from(original: wasmer::ExportError) -> Self {
-        VmError::resolve_err(format!("Could not get export: {}", original))
+        VmError::resolve_err(format!("Could not get export: {original}"))
     }
 }
 
 impl From<wasmer::SerializeError> for VmError {
     fn from(original: wasmer::SerializeError) -> Self {
-        VmError::cache_err(format!("Could not serialize module: {}", original))
+        VmError::cache_err(format!("Could not serialize module: {original}"))
     }
 }
 
 impl From<wasmer::DeserializeError> for VmError {
     fn from(original: wasmer::DeserializeError) -> Self {
-        VmError::cache_err(format!("Could not deserialize module: {}", original))
+        VmError::cache_err(format!("Could not deserialize module: {original}"))
     }
 }
 
@@ -381,7 +381,7 @@ impl From<wasmer::RuntimeError> for VmError {
 
 impl From<wasmer::CompileError> for VmError {
     fn from(original: wasmer::CompileError) -> Self {
-        VmError::compile_err(format!("Could not compile: {}", original))
+        VmError::compile_err(format!("Could not compile: {original}"))
     }
 }
 
@@ -412,7 +412,7 @@ mod tests {
                 source: BackendError::Unknown { msg },
                 ..
             } => assert_eq!(msg, "something went wrong"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -421,7 +421,7 @@ mod tests {
         let error = VmError::cache_err("something went wrong");
         match error {
             VmError::CacheErr { msg, .. } => assert_eq!(msg, "something went wrong"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -430,7 +430,7 @@ mod tests {
         let error = VmError::compile_err("something went wrong");
         match error {
             VmError::CompileErr { msg, .. } => assert_eq!(msg, "something went wrong"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -448,7 +448,7 @@ mod tests {
                 assert_eq!(to_type, "u32");
                 assert_eq!(input, "-9");
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -460,7 +460,7 @@ mod tests {
                 source: CryptoError::GenericErr { msg, .. },
                 ..
             } => assert_eq!(msg, "something went wrong"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -469,19 +469,19 @@ mod tests {
         let error = VmError::gas_depletion();
         match error {
             VmError::GasDepletion { .. } => {}
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
     #[test]
     fn generic_err_works() {
         let guess = 7;
-        let error = VmError::generic_err(format!("{} is too low", guess));
+        let error = VmError::generic_err(format!("{guess} is too low"));
         match error {
             VmError::GenericErr { msg, .. } => {
                 assert_eq!(msg, String::from("7 is too low"));
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -490,7 +490,7 @@ mod tests {
         let error = VmError::instantiation_err("something went wrong");
         match error {
             VmError::InstantiationErr { msg, .. } => assert_eq!(msg, "something went wrong"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -499,7 +499,7 @@ mod tests {
         let error = VmError::integrity_err();
         match error {
             VmError::IntegrityErr { .. } => {}
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -513,7 +513,7 @@ mod tests {
                 assert_eq!(target_type, "Book");
                 assert_eq!(msg, "Missing field: title");
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -527,7 +527,7 @@ mod tests {
                 assert_eq!(source_type, "Book");
                 assert_eq!(msg, "Content too long");
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -536,7 +536,7 @@ mod tests {
         let error = VmError::resolve_err("function has different signature");
         match error {
             VmError::ResolveErr { msg, .. } => assert_eq!(msg, "function has different signature"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -554,7 +554,7 @@ mod tests {
                 assert_eq!(expected, 0);
                 assert_eq!(actual, 1);
             }
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -563,7 +563,7 @@ mod tests {
         let error = VmError::runtime_err("something went wrong");
         match error {
             VmError::RuntimeErr { msg, .. } => assert_eq!(msg, "something went wrong"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -572,7 +572,7 @@ mod tests {
         let error = VmError::static_validation_err("export xy missing");
         match error {
             VmError::StaticValidationErr { msg, .. } => assert_eq!(msg, "export xy missing"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -581,7 +581,7 @@ mod tests {
         let error = VmError::uninitialized_context_data("foo");
         match error {
             VmError::UninitializedContextData { kind, .. } => assert_eq!(kind, "foo"),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -590,7 +590,7 @@ mod tests {
         let error = VmError::write_access_denied();
         match error {
             VmError::WriteAccessDenied { .. } => {}
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 }
diff --git a/packages/vm/src/imports.rs b/packages/vm/src/imports.rs
index 0fab00a1b5..d9769d7861 100644
--- a/packages/vm/src/imports.rs
+++ b/packages/vm/src/imports.rs
@@ -764,7 +764,7 @@ mod tests {
                 source: CommunicationError::RegionLengthTooBig { length, .. },
                 ..
             } => assert_eq!(length, 300 * 1024),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -863,7 +863,7 @@ mod tests {
                 assert_eq!(length, 300 * 1024);
                 assert_eq!(max_length, MAX_LENGTH_DB_KEY);
             }
-            err => panic!("unexpected error: {:?}", err),
+            err => panic!("unexpected error: {err:?}"),
         };
     }
 
@@ -890,7 +890,7 @@ mod tests {
                 assert_eq!(length, 300 * 1024);
                 assert_eq!(max_length, MAX_LENGTH_DB_VALUE);
             }
-            err => panic!("unexpected error: {:?}", err),
+            err => panic!("unexpected error: {err:?}"),
         };
     }
 
@@ -909,7 +909,7 @@ mod tests {
         let result = do_db_write(fe_mut, key_ptr, value_ptr);
         match result.unwrap_err() {
             VmError::WriteAccessDenied { .. } => {}
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -927,7 +927,7 @@ mod tests {
         fe_mut
             .data()
             .with_storage_from_context::<_, _>(|store| {
-                println!("{:?}", store);
+                println!("{store:?}");
                 Ok(())
             })
             .unwrap();
@@ -937,7 +937,7 @@ mod tests {
         fe_mut
             .data()
             .with_storage_from_context::<_, _>(|store| {
-                println!("{:?}", store);
+                println!("{store:?}");
                 Ok(())
             })
             .unwrap();
@@ -996,7 +996,7 @@ mod tests {
                 assert_eq!(length, 300 * 1024);
                 assert_eq!(max_length, MAX_LENGTH_DB_KEY);
             }
-            err => panic!("unexpected error: {:?}", err),
+            err => panic!("unexpected error: {err:?}"),
         };
     }
 
@@ -1014,7 +1014,7 @@ mod tests {
         let result = do_db_remove(fe_mut, key_ptr);
         match result.unwrap_err() {
             VmError::WriteAccessDenied { .. } => {}
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -1084,7 +1084,7 @@ mod tests {
                 source: BackendError::Unknown { msg, .. },
                 ..
             } => assert_eq!(msg, "Temporarily unavailable"),
-            err => panic!("Incorrect error returned: {:?}", err),
+            err => panic!("Incorrect error returned: {err:?}"),
         }
     }
 
@@ -1110,7 +1110,7 @@ mod tests {
                 assert_eq!(length, 333);
                 assert_eq!(max_length, 256);
             }
-            err => panic!("Incorrect error returned: {:?}", err),
+            err => panic!("Incorrect error returned: {err:?}"),
         }
     }
 
@@ -1182,7 +1182,7 @@ mod tests {
                 source: BackendError::Unknown { msg, .. },
                 ..
             } => assert_eq!(msg, "Temporarily unavailable"),
-            err => panic!("Incorrect error returned: {:?}", err),
+            err => panic!("Incorrect error returned: {err:?}"),
         }
     }
 
@@ -1209,7 +1209,7 @@ mod tests {
                 assert_eq!(length, 333);
                 assert_eq!(max_length, 256);
             }
-            err => panic!("Incorrect error returned: {:?}", err),
+            err => panic!("Incorrect error returned: {err:?}"),
         }
     }
 
@@ -1233,7 +1233,7 @@ mod tests {
                 assert_eq!(size, 7);
                 assert_eq!(required, api.canonical_length());
             }
-            err => panic!("Incorrect error returned: {:?}", err),
+            err => panic!("Incorrect error returned: {err:?}"),
         }
     }
 
@@ -1289,7 +1289,7 @@ mod tests {
                 source: BackendError::Unknown { msg, .. },
                 ..
             } => assert_eq!(msg, "Temporarily unavailable"),
-            err => panic!("Incorrect error returned: {:?}", err),
+            err => panic!("Incorrect error returned: {err:?}"),
         };
     }
 
@@ -1316,7 +1316,7 @@ mod tests {
                 assert_eq!(length, 65);
                 assert_eq!(max_length, 64);
             }
-            err => panic!("Incorrect error returned: {:?}", err),
+            err => panic!("Incorrect error returned: {err:?}"),
         }
     }
 
@@ -1342,7 +1342,7 @@ mod tests {
                 assert_eq!(size, 2);
                 assert_eq!(required, api.canonical_length());
             }
-            err => panic!("Incorrect error returned: {:?}", err),
+            err => panic!("Incorrect error returned: {err:?}"),
         }
     }
 
@@ -1407,7 +1407,7 @@ mod tests {
                 source: CommunicationError::RegionLengthTooBig { length, .. },
                 ..
             } => assert_eq!(length, MESSAGE_HASH_MAX_LEN + 1),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -1474,7 +1474,7 @@ mod tests {
                 source: CommunicationError::RegionLengthTooBig { length, .. },
                 ..
             } => assert_eq!(length, ECDSA_SIGNATURE_LEN + 1),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -1562,7 +1562,7 @@ mod tests {
                 source: CommunicationError::RegionLengthTooBig { length, .. },
                 ..
             } => assert_eq!(length, ECDSA_PUBKEY_MAX_LEN + 1),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -1709,7 +1709,7 @@ mod tests {
                 source: CommunicationError::RegionLengthTooBig { length, .. },
                 ..
             } => assert_eq!(length, msg.len()),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -1755,7 +1755,7 @@ mod tests {
                 source: CommunicationError::RegionLengthTooBig { length, .. },
                 ..
             } => assert_eq!(length, MAX_LENGTH_ED25519_SIGNATURE + 1),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -1822,7 +1822,7 @@ mod tests {
                 source: CommunicationError::RegionLengthTooBig { length, .. },
                 ..
             } => assert_eq!(length, EDDSA_PUBKEY_LEN + 1),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -1931,7 +1931,7 @@ mod tests {
             SystemResult::Err(SystemError::InvalidRequest { request: err, .. }) => {
                 assert_eq!(err.as_slice(), request)
             }
-            SystemResult::Err(err) => panic!("Unexpected error: {:?}", err),
+            SystemResult::Err(err) => panic!("Unexpected error: {err:?}"),
         }
     }
 
@@ -1960,7 +1960,7 @@ mod tests {
             SystemResult::Err(SystemError::NoSuchContract { addr }) => {
                 assert_eq!(addr, "non-existent")
             }
-            SystemResult::Err(err) => panic!("Unexpected error: {:?}", err),
+            SystemResult::Err(err) => panic!("Unexpected error: {err:?}"),
         }
     }
 
@@ -2118,7 +2118,7 @@ mod tests {
                 source: CommunicationError::InvalidOrder { .. },
                 ..
             } => {}
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 
@@ -2169,7 +2169,7 @@ mod tests {
                 source: BackendError::IteratorDoesNotExist { id, .. },
                 ..
             } => assert_eq!(id, non_existent_id),
-            e => panic!("Unexpected error: {:?}", e),
+            e => panic!("Unexpected error: {e:?}"),
         }
     }
 }
diff --git a/packages/vm/src/instance.rs b/packages/vm/src/instance.rs
index 5cfb9fabf1..47f991a746 100644
--- a/packages/vm/src/instance.rs
+++ b/packages/vm/src/instance.rs
@@ -748,7 +748,7 @@ mod tests {
 
         match init_result.unwrap_err() {
             VmError::RuntimeErr { msg, .. } => assert!(msg.contains(error_message)),
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
@@ -777,7 +777,7 @@ mod tests {
                 assert_eq!(length, 6);
                 assert_eq!(max_length, 5);
             }
-            err => panic!("unexpected error: {:?}", err),
+            err => panic!("unexpected error: {err:?}"),
         };
 
         instance.deallocate(region_ptr).expect("error deallocating");
diff --git a/packages/vm/src/limited.rs b/packages/vm/src/limited.rs
index 1475dc4712..61bac32f87 100644
--- a/packages/vm/src/limited.rs
+++ b/packages/vm/src/limited.rs
@@ -73,9 +73,9 @@ fn collection_to_string_limited<E: AsRef<str>, I: ExactSizeIterator<Item = E>>(
             let skipped = elements_count - lengths_stack.len();
             let remaining = elements_count - skipped;
             let skipped_text = if remaining == 0 {
-                format!("... {} elements", skipped)
+                format!("... {skipped} elements")
             } else {
-                format!(", ... {} more", skipped)
+                format!(", ... {skipped} more")
             };
             if previous_length + skipped_text.len() + closing.len() <= max_length {
                 out.truncate(previous_length);
diff --git a/packages/vm/src/memory.rs b/packages/vm/src/memory.rs
index 04aa6f054e..5143de0bd4 100644
--- a/packages/vm/src/memory.rs
+++ b/packages/vm/src/memory.rs
@@ -194,7 +194,7 @@ mod tests {
         let result = validate_region(&region);
         match result.unwrap_err() {
             RegionValidationError::ZeroOffset { .. } => {}
-            e => panic!("Got unexpected error: {:?}", e),
+            e => panic!("Got unexpected error: {e:?}"),
         }
     }
 
@@ -213,7 +213,7 @@ mod tests {
                 assert_eq!(length, 501);
                 assert_eq!(capacity, 500);
             }
-            e => panic!("Got unexpected error: {:?}", e),
+            e => panic!("Got unexpected error: {e:?}"),
         }
     }
 
@@ -232,7 +232,7 @@ mod tests {
                 assert_eq!(offset, 23);
                 assert_eq!(capacity, u32::MAX);
             }
-            e => panic!("Got unexpected error: {:?}", e),
+            e => panic!("Got unexpected error: {e:?}"),
         }
 
         let region = Region {
@@ -248,7 +248,7 @@ mod tests {
                 assert_eq!(offset, u32::MAX);
                 assert_eq!(capacity, 1);
             }
-            e => panic!("Got unexpected error: {:?}", e),
+            e => panic!("Got unexpected error: {e:?}"),
         }
     }
 }
diff --git a/packages/vm/src/modules/file_system_cache.rs b/packages/vm/src/modules/file_system_cache.rs
index aef4be3ec8..68c218ee49 100644
--- a/packages/vm/src/modules/file_system_cache.rs
+++ b/packages/vm/src/modules/file_system_cache.rs
@@ -137,13 +137,11 @@ impl FileSystemCache {
             Err(DeserializeError::Io(err)) => match err.kind() {
                 io::ErrorKind::NotFound => Ok(None),
                 _ => Err(VmError::cache_err(format!(
-                    "Error opening module file: {}",
-                    err
+                    "Error opening module file: {err}"
                 ))),
             },
             Err(err) => Err(VmError::cache_err(format!(
-                "Error deserializing module: {}",
-                err
+                "Error deserializing module: {err}"
             ))),
         }
     }
@@ -157,7 +155,7 @@ impl FileSystemCache {
         let path = self.modules_path.join(filename);
         module
             .serialize_to_file(&path)
-            .map_err(|e| VmError::cache_err(format!("Error writing module to disk: {}", e)))?;
+            .map_err(|e| VmError::cache_err(format!("Error writing module to disk: {e}")))?;
         let module_size = module_size(&path)?;
         Ok(module_size)
     }
@@ -204,8 +202,7 @@ fn target_id(target: &Target) -> String {
 /// The path to the latest version of the modules.
 fn modules_path(base_path: &Path, wasmer_module_version: u32, target: &Target) -> PathBuf {
     let version_dir = format!(
-        "{}-wasmer{}",
-        MODULE_SERIALIZATION_VERSION, wasmer_module_version
+        "{MODULE_SERIALIZATION_VERSION}-wasmer{wasmer_module_version}"
     );
     let target_dir = target_id(target);
     base_path.join(version_dir).join(target_dir)
diff --git a/packages/vm/src/modules/in_memory_cache.rs b/packages/vm/src/modules/in_memory_cache.rs
index ca8bc6a579..0a876e019b 100644
--- a/packages/vm/src/modules/in_memory_cache.rs
+++ b/packages/vm/src/modules/in_memory_cache.rs
@@ -65,7 +65,7 @@ impl InMemoryCache {
                         size,
                     },
                 )
-                .map_err(|e| VmError::cache_err(format!("{:?}", e)))?;
+                .map_err(|e| VmError::cache_err(format!("{e:?}")))?;
         }
         Ok(())
     }
diff --git a/packages/vm/src/serde.rs b/packages/vm/src/serde.rs
index c884dd1b80..ce6c9e0f81 100644
--- a/packages/vm/src/serde.rs
+++ b/packages/vm/src/serde.rs
@@ -95,7 +95,7 @@ mod tests {
                 assert_eq!(length, 13);
                 assert_eq!(max_length, 5);
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
diff --git a/packages/vm/src/static_analysis.rs b/packages/vm/src/static_analysis.rs
index cb577f9135..94e644721d 100644
--- a/packages/vm/src/static_analysis.rs
+++ b/packages/vm/src/static_analysis.rs
@@ -15,8 +15,7 @@ pub const REQUIRED_IBC_EXPORTS: &[&str] = &[
 pub fn deserialize_wasm(wasm_code: &[u8]) -> VmResult<Module> {
     deserialize_buffer(wasm_code).map_err(|err| {
         VmError::static_validation_err(format!(
-            "Wasm bytecode could not be deserialized. Deserialization error: \"{}\"",
-            err
+            "Wasm bytecode could not be deserialized. Deserialization error: \"{err}\""
         ))
     })
 }
@@ -119,7 +118,7 @@ mod tests {
             VmError::StaticValidationErr { msg, .. } => {
                 assert!(msg.starts_with("Wasm bytecode could not be deserialized."))
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
diff --git a/packages/vm/src/testing/instance.rs b/packages/vm/src/testing/instance.rs
index 6a4f11a37f..0b94321d7e 100644
--- a/packages/vm/src/testing/instance.rs
+++ b/packages/vm/src/testing/instance.rs
@@ -193,8 +193,7 @@ where
             let wasm_data = instance.read_memory(wasm_ptr, size).expect("error reading");
             assert_eq!(
                 original, wasm_data,
-                "failed for size {}; expected: {:?}; actual: {:?}",
-                size, original, wasm_data
+                "failed for size {size}; expected: {original:?}; actual: {wasm_data:?}"
             );
             instance
                 .deallocate(wasm_ptr)
diff --git a/packages/vm/src/testing/mock.rs b/packages/vm/src/testing/mock.rs
index 64bacb40cf..15c7942eb3 100644
--- a/packages/vm/src/testing/mock.rs
+++ b/packages/vm/src/testing/mock.rs
@@ -249,7 +249,7 @@ mod tests {
         let (result, _gas_info) = api.human_address(&input);
         match result.unwrap_err() {
             BackendError::UserErr { .. } => {}
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
@@ -259,7 +259,7 @@ mod tests {
         let human = "1";
         match api.canonical_address(human).0.unwrap_err() {
             BackendError::UserErr { msg } => assert!(msg.contains("too short")),
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
@@ -269,7 +269,7 @@ mod tests {
         let human = "longer-than-the-address-length-supported-by-this-api-longer-than-54";
         match api.canonical_address(human).0.unwrap_err() {
             BackendError::UserErr { msg } => assert!(msg.contains("too long")),
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 }
diff --git a/packages/vm/src/testing/querier.rs b/packages/vm/src/testing/querier.rs
index 6a3edae14b..a578fca2b5 100644
--- a/packages/vm/src/testing/querier.rs
+++ b/packages/vm/src/testing/querier.rs
@@ -99,7 +99,7 @@ impl MockQuerier {
                 let gas_info = GasInfo::with_externally_used(err.to_string().len() as u64);
                 return (
                     Ok(SystemResult::Err(SystemError::InvalidRequest {
-                        error: format!("Serializing query request: {}", err),
+                        error: format!("Serializing query request: {err}"),
                         request: b"N/A".into(),
                     })),
                     gas_info,
@@ -127,7 +127,7 @@ mod tests {
         let (result, _gas_info) = querier.query_raw(b"broken request", gas_limit);
         match result.unwrap_err() {
             BackendError::OutOfGas {} => {}
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 
diff --git a/packages/vm/src/wasm_backend/gatekeeper.rs b/packages/vm/src/wasm_backend/gatekeeper.rs
index dc0f443883..3062e3950b 100644
--- a/packages/vm/src/wasm_backend/gatekeeper.rs
+++ b/packages/vm/src/wasm_backend/gatekeeper.rs
@@ -222,7 +222,7 @@ impl FunctionMiddleware for FunctionGatekeeper {
                     state.push_operator(operator);
                     Ok(())
                 } else {
-                    let msg = format!("Reference type operation detected: {:?}. Reference types are not supported.", operator);
+                    let msg = format!("Reference type operation detected: {operator:?}. Reference types are not supported.");
                     Err(MiddlewareError::new(MIDDLEWARE_NAME, msg))
                 }
             }
@@ -297,7 +297,7 @@ impl FunctionMiddleware for FunctionGatekeeper {
                     state.push_operator(operator);
                     Ok(())
                 } else {
-                    let msg = format!("Threads operator detected: {:?}. The Wasm Threads extension is not supported.", operator);
+                    let msg = format!("Threads operator detected: {operator:?}. The Wasm Threads extension is not supported.");
                     Err(MiddlewareError::new(MIDDLEWARE_NAME, msg))
                 }
             }
@@ -490,8 +490,7 @@ impl FunctionMiddleware for FunctionGatekeeper {
                     Ok(())
                 } else {
                     let msg = format!(
-                        "SIMD operator detected: {:?}. The Wasm SIMD extension is not supported.",
-                        operator
+                        "SIMD operator detected: {operator:?}. The Wasm SIMD extension is not supported."
                     );
                     Err(MiddlewareError::new(MIDDLEWARE_NAME, msg))
                 }
@@ -519,8 +518,7 @@ impl FunctionMiddleware for FunctionGatekeeper {
             | Operator::I32x4DotI8x16I7x16AddS
             | Operator::F32x4RelaxedDotBf16x8AddF32x4 => {
                 let msg = format!(
-                    "Relaxed SIMD operator detected: {:?}. The Wasm Relaxed SIMD extension is not supported.",
-                    operator
+                    "Relaxed SIMD operator detected: {operator:?}. The Wasm Relaxed SIMD extension is not supported."
                 );
                 Err(MiddlewareError::new(MIDDLEWARE_NAME, msg))
             }
@@ -657,8 +655,7 @@ impl FunctionMiddleware for FunctionGatekeeper {
                     Ok(())
                 } else {
                     let msg = format!(
-                        "Float operator detected: {:?}. The use of floats is not supported.",
-                        operator
+                        "Float operator detected: {operator:?}. The use of floats is not supported."
                     );
                     Err(MiddlewareError::new(MIDDLEWARE_NAME, msg))
                 }
@@ -675,7 +672,7 @@ impl FunctionMiddleware for FunctionGatekeeper {
                     state.push_operator(operator);
                     Ok(())
                 } else {
-                    let msg = format!("Bulk memory operation detected: {:?}. Bulk memory operations are not supported.", operator);
+                    let msg = format!("Bulk memory operation detected: {operator:?}. Bulk memory operations are not supported.");
                     Err(MiddlewareError::new(MIDDLEWARE_NAME, msg))
                 }
             }
@@ -689,7 +686,7 @@ impl FunctionMiddleware for FunctionGatekeeper {
                     state.push_operator(operator);
                     Ok(())
                 } else {
-                    let msg = format!("Exception handling operation detected: {:?}. Exception handling is not supported.", operator);
+                    let msg = format!("Exception handling operation detected: {operator:?}. Exception handling is not supported.");
                     Err(MiddlewareError::new(MIDDLEWARE_NAME, msg))
                 }
             }
diff --git a/packages/vm/src/wasm_backend/limiting_tunables.rs b/packages/vm/src/wasm_backend/limiting_tunables.rs
index d0b5c8a999..cc476930af 100644
--- a/packages/vm/src/wasm_backend/limiting_tunables.rs
+++ b/packages/vm/src/wasm_backend/limiting_tunables.rs
@@ -186,7 +186,7 @@ mod tests {
             MemoryError::Generic(msg) => {
                 assert_eq!(msg, "Maximum exceeds the allowed memory limit")
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
 
         // Maximum not set
@@ -194,7 +194,7 @@ mod tests {
         let result = limiting.validate_memory(&memory);
         match result.unwrap_err() {
             MemoryError::Generic(msg) => assert_eq!(msg, "Maximum unset"),
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
 
         // Minimum greater than maximum (not our problem)
@@ -208,7 +208,7 @@ mod tests {
             MemoryError::Generic(msg) => {
                 assert_eq!(msg, "Minimum exceeds the allowed memory limit")
             }
-            err => panic!("Unexpected error: {:?}", err),
+            err => panic!("Unexpected error: {err:?}"),
         }
     }
 }

From 6d5f98b2c90cbc6afcf19bd9a8cf2d8d7e6c8fe6 Mon Sep 17 00:00:00 2001
From: Christoph Otter <chris@confio.gmbh>
Date: Tue, 27 Jun 2023 12:29:27 +0200
Subject: [PATCH 10/13] cargo fmt

---
 packages/vm/src/calls.rs                     | 5 ++---
 packages/vm/src/modules/file_system_cache.rs | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/vm/src/calls.rs b/packages/vm/src/calls.rs
index d55389c16a..dc24a11a6f 100644
--- a/packages/vm/src/calls.rs
+++ b/packages/vm/src/calls.rs
@@ -206,9 +206,8 @@ where
         from_slice(&data, deserialization_limits::RESULT_QUERY)?;
     // Ensure query response is valid JSON
     if let ContractResult::Ok(binary_response) = &result {
-        serde_json::from_slice::<serde_json::Value>(binary_response.as_slice()).map_err(|e| {
-            VmError::generic_err(format!("Query response must be valid JSON. {e}"))
-        })?;
+        serde_json::from_slice::<serde_json::Value>(binary_response.as_slice())
+            .map_err(|e| VmError::generic_err(format!("Query response must be valid JSON. {e}")))?;
     }
 
     Ok(result)
diff --git a/packages/vm/src/modules/file_system_cache.rs b/packages/vm/src/modules/file_system_cache.rs
index 68c218ee49..f2298c8f6e 100644
--- a/packages/vm/src/modules/file_system_cache.rs
+++ b/packages/vm/src/modules/file_system_cache.rs
@@ -201,9 +201,7 @@ fn target_id(target: &Target) -> String {
 
 /// The path to the latest version of the modules.
 fn modules_path(base_path: &Path, wasmer_module_version: u32, target: &Target) -> PathBuf {
-    let version_dir = format!(
-        "{MODULE_SERIALIZATION_VERSION}-wasmer{wasmer_module_version}"
-    );
+    let version_dir = format!("{MODULE_SERIALIZATION_VERSION}-wasmer{wasmer_module_version}");
     let target_dir = target_id(target);
     base_path.join(version_dir).join(target_dir)
 }

From 14d35a2dbfe4a4f5b70f2d69c81d8b9b744506fd Mon Sep 17 00:00:00 2001
From: Christoph Otter <chris@confio.gmbh>
Date: Tue, 27 Jun 2023 13:16:04 +0200
Subject: [PATCH 11/13] Fix cyberpunk clippy

---
 contracts/cyberpunk/src/contract.rs      | 2 +-
 contracts/cyberpunk/tests/integration.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contracts/cyberpunk/src/contract.rs b/contracts/cyberpunk/src/contract.rs
index 7de7d80fd2..bc9c7052e9 100644
--- a/contracts/cyberpunk/src/contract.rs
+++ b/contracts/cyberpunk/src/contract.rs
@@ -57,7 +57,7 @@ fn execute_argon2(mem_cost: u32, time_cost: u32) -> Result<Response, ContractErr
         hash_length: 32,
     };
     let hash = argon2::hash_encoded(password, salt, &config)
-        .map_err(|e| StdError::generic_err(format!("hash_encoded errored: {}", e)))?;
+        .map_err(|e| StdError::generic_err(format!("hash_encoded errored: {e}")))?;
     // let matches = argon2::verify_encoded(&hash, password).unwrap();
     // assert!(matches);
     Ok(Response::new().set_data(hash.into_bytes()))
diff --git a/contracts/cyberpunk/tests/integration.rs b/contracts/cyberpunk/tests/integration.rs
index ecd7306995..8abdc74f59 100644
--- a/contracts/cyberpunk/tests/integration.rs
+++ b/contracts/cyberpunk/tests/integration.rs
@@ -52,8 +52,8 @@ fn execute_argon2() {
     // Note: the exact gas usage depends on the Rust version used to compile Wasm,
     // which we only fix when using rust-optimizer, not integration tests.
     let expected = 8635688250000; // +/- 20%
-    assert!(gas_used > expected * 80 / 100, "Gas used: {}", gas_used);
-    assert!(gas_used < expected * 120 / 100, "Gas used: {}", gas_used);
+    assert!(gas_used > expected * 80 / 100, "Gas used: {gas_used}");
+    assert!(gas_used < expected * 120 / 100, "Gas used: {gas_used}");
 }
 
 // Test with

From bb413cc46afff751546f3394a5120923c6c4005a Mon Sep 17 00:00:00 2001
From: Christoph Otter <chris@confio.gmbh>
Date: Tue, 27 Jun 2023 13:17:23 +0200
Subject: [PATCH 12/13] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 303090ccdc..3636d5af41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,7 +42,7 @@ and this project adheres to
 - cosmwasm-vm: Add `Instance::set_debug_handler`/`unset_debug_handler` to allow
   customizing the handling of debug messages emitted by the contract ([#1667]).
 - cosmwasm-vm: Add `.wasm` extension to stored wasm files ([#1686]).
-- cosmwasm-vm: Upgrade Wasmer to version 3.3.0.
+- cosmwasm-vm: Upgrade Wasmer to version 4.0.0.
 - cosmwasm-check: Update clap dependency to version 4 ([#1677])
 - cosmwasm-std: Coin uses shorter `Coin { 123 "ucosm" }` format for Debug
   ([#1704])

From afc610acd0eb640cf3458063fd28f44d8199df6a Mon Sep 17 00:00:00 2001
From: Christoph Otter <chris@confio.gmbh>
Date: Tue, 27 Jun 2023 13:41:44 +0200
Subject: [PATCH 13/13] Update mergify config

---
 .mergify.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mergify.yml b/.mergify.yml
index a1d0596643..f37873c2bf 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -13,7 +13,7 @@ pull_request_rules:
       - "status-success=macOS"
       - "status-success=Windows"
       - "status-success=ci/circleci: arm64"
-      - "status-success=ci/circleci: clippy-1.60.0"
+      - "status-success=ci/circleci: clippy-1.67.0"
       - "status-success=ci/circleci: clippy-1.68.2"
       - "status-success=ci/circleci: contract_burner"
       - "status-success=ci/circleci: contract_crypto_verify"