chore: update wasmtime

Cargo.toml

@@ -384,7 +384,7 @@ tracing-subscriber = { version = "0.3.18", features = [
 ] }
 trybuild = "1.0.11"
 turn = "0.6"
-wasm-encoder = "0.218.0"
+wasm-encoder = "0.221.0"
 wasmer-compiler = { package = "wasmer-compiler-near", version = "=2.4.1" }
 wasmer-compiler-singlepass = { package = "wasmer-compiler-singlepass-near", version = "=2.4.1" }
 wasmer-engine = { package = "wasmer-engine-near", version = "=2.4.1" }
@@ -398,9 +398,9 @@ wasmer-runtime-core = { version = "0.18.2", package = "wasmer-runtime-core-near"
 wasmer-types = { package = "wasmer-types-near", version = "=2.4.1" }
 wasmer-vm = { package = "wasmer-vm-near", version = "=2.4.1" }
 wasmparser = "0.78" # TODO: unify at least the versions of wasmparser we have in our codebase
-wasmprinter = "0.218"
-wasm-smith = "0.218"
-wasmtime = { version = "26.0.1", default-features = false, features = [
+wasmprinter = "0.221"
+wasm-smith = "0.221"
+wasmtime = { version = "29.0.1", default-features = false, features = [
     "cranelift",
 ] }
 wast = "40.0"

deny.toml

@@ -42,7 +42,6 @@ skip = [
 
     # Need this specific version of pwasm-utils for backwards-compatible
     # stack limiting.
-    { name = "pwasm-utils", version = "=0.12.0" },
     { name = "parity-wasm", version = "=0.41.0" },
     # old version used by wasmer et al
     { name = "dynasm", version = "=1.2.3" },
@@ -57,7 +56,6 @@ skip = [
     { name = "object", version = "=0.30.4" },
     { name = "memoffset", version = "=0.6.5" },
     { name = "memoffset", version = "=0.8.0" },
-    { name = "addr2line", version = "=0.19.0" },
     { name = "gimli", version = "=0.27.2" },
 
     # wasm-tools
@@ -69,6 +67,7 @@ skip = [
     { name = "wasmprinter", version = "=0.2.57" },
 
     # wasmer 0.17.x
+    { name = "target-lexicon", version = "^0.12.0" },
     { name = "parking_lot", version = "=0.10.2" },
     { name = "parking_lot_core", version = "=0.7.2" },
     { name = "lock_api", version = "=0.3.4" },
@@ -89,7 +88,6 @@ skip = [
     { name = "getrandom", version = "=0.1.16" },
 
     # criterion and criterion-plot use conflicting versions
-    { name = "semver-parser", version = "=0.7.0" },
     { name = "semver", version = "=0.9.0" },
 
     # criterion, wasmer-runtime-core-near, rocksdb depend on this older version of the crate.
@@ -109,9 +107,6 @@ skip = [
     # prometheus depends on an old version of protobuf
     { name = "protobuf", version = "=2.27.1" },
 
-    # rust-s3 is using an old version of smartstring
-    { name = "smartstring", version = "=0.2.10" },
-
     # Various packages haven’t upgraded to 0.base64 21 yet.
     { name = "base64", version = "=0.13.0" },
     { name = "ahash", version = "=0.7.8" },

runtime/near-vm-runner/src/near_vm_runner/mod.rs

@@ -28,7 +28,7 @@
 #[derive(Hash, PartialEq, Debug)]
 #[allow(unused)]
 enum NearVmCompiler {
     Singlepass = 1,
     Cranelift = 2,
     Llvm = 3,
 }
@@ -38,9 +38,9 @@
 //  major version << 6
 //  minor version
 const VM_CONFIG: NearVmConfig = NearVmConfig {
-    seed: (2 << 29) | (2 << 6) | 4,
+    seed: (2 << 29) | (2 << 6) | 5,
     engine: NearVmEngine::Universal,
     compiler: NearVmCompiler::Singlepass,
 };
 
 pub(crate) fn near_vm_vm_hash() -> u64 {

runtime/near-vm-runner/src/tests/cache.rs

@@ -30,7 +30,7 @@
         let code = [42; 1000];
         let code = ContractCode::new(code.to_vec(), None);
         let code_hash = *code.hash();
         let terragas = 1000000000000u64;
         assert_eq!(cache.len(), 0);
         let outcome1 = make_cached_contract_call_vm(
             Arc::clone(&config),
@@ -38,7 +38,7 @@
             code_hash,
             Some(&code),
             "method_name1",
             terragas,
             vm_kind,
         )
         .expect("bad failure");
@@ -50,7 +50,7 @@
             code_hash,
             None,
             "method_name2",
             terragas,
             vm_kind,
         )
         .expect("bad failure");
@@ -148,23 +148,23 @@
     // fall through the cracks here, but hopefully it should catch most of the fish just fine.
     let seeds = [2, 3, 5, 7, 11, 13, 17];
     let prepared_hashes = [
-        7891448467132053449,
-        9113804040784454744,
-        15987320570619072032,
-        7232953852262286521,
-        7536220052944640509,
-        13392993251733921322,
-        4364804287818604246,
+        10570074354427437071,
+        112822494854026494,
+        8923373422804896330,
+        7482465259708658318,
+        17593373341226268225,
+        16574762561946343960,
+        6263133173262547027,
     ];
     let mut got_prepared_hashes = Vec::with_capacity(seeds.len());
     let compiled_hashes = [
-        17577916829021396775,
-        8041373570933915084,
-        6630926580728989211,
-        4387381945665529622,
-        4511251750786693810,
-        4599571621125708978,
-        18136310787576767811,
+        13571899357794997814,
+        3529004220149248510,
+        12618963124682967106,
+        17344326048993250539,
+        9020736083169133944,
+        6686183491943308521,
+        12077631041629763505,
     ];
     let mut got_compiled_hashes = Vec::with_capacity(seeds.len());
     for seed in seeds {
@@ -227,24 +227,24 @@
     let seeds = [2, 3, 5, 7, 11, 13, 17];
     let prepared_hashes = [
         // See the above comment if you want to change this
-        1949662663451079349,
-        2708994788591458264,
-        5012156334458820956,
-        9920955889305541399,
-        18300200182157745360,
-        870351225951448146,
-        2224723427035408206,
+        2827992185785358581,
+        17421797339778310713,
+        16714934007236574397,
+        1884675227101889895,
+        10936343070920321432,
+        10728749071033926115,
+        8212262804128939827,
     ];
     let mut got_prepared_hashes = Vec::with_capacity(seeds.len());
     let compiled_hashes = [
         // See the above comment if you want to change this
-        17541855811103092909,
-        11151026003357116368,
-        6536268071368571568,
-        3800417228716434560,
-        12640841643239683751,
-        10206902649207070630,
-        14540739231666637305,
+        1182021398207161502,
+        905660765117347293,
+        16348151278815489293,
+        4289237417580123383,
+        13920596352648058761,
+        6324750771081683425,
+        4237611324950808774,
     ];
     let mut got_compiled_hashes = Vec::with_capacity(seeds.len());
     for seed in seeds {

runtime/near-vm-runner/src/tests/test_builder.rs

@@ -236,7 +236,11 @@ impl TestBuilder {
 
                 if let Some(err) = outcome.aborted {
                     let err_str = err.to_string();
-                    assert!(err_str.len() < 1000, "errors should be bounded in size to prevent abuse via exhausting the storage space");
+                    assert!(
+                        err_str.len() < 1000,
+                        "errors should be bounded in size to prevent abuse \
+                         via exhausting the storage space. Got: {err_str}"
+                    );
                     if self.opaque_error {
                         writeln!(&mut got, "Err: ...").unwrap();
                     } else {

runtime/near-vm-runner/src/wasmer2_runner.rs

@@ -1,5 +1,5 @@
 use crate::cache::{CompiledContract, CompiledContractInfo, ContractRuntimeCache};
 use crate::errors::ContractPrecompilatonResult;
 use crate::logic::errors::{
     CacheError, CompilationError, FunctionCallError, MethodResolveError, VMRunnerError, WasmTrap,
 };
@@ -11,14 +11,14 @@
 use crate::runner::VMResult;
 use crate::{get_contract_cache_key, imports, ContractCode};
 use crate::{prepare, Contract};
 use memoffset::offset_of;
 use near_parameters::vm::VMKind;
 use near_parameters::RuntimeFeesConfig;
 use std::borrow::Cow;
 use std::hash::Hash;
 use std::mem::size_of;
 use std::sync::Arc;
 use wasmer_compiler_singlepass::Singlepass;
 use wasmer_engine::{Engine, Executable};
 use wasmer_engine_universal::{
     Universal, UniversalEngine, UniversalExecutable, UniversalExecutableRef,
@@ -218,7 +218,7 @@
 //  major version << 6
 //  minor version
 const WASMER2_CONFIG: Wasmer2Config = Wasmer2Config {
-    seed: (1 << 29) | (12 << 6) | 3,
+    seed: (1 << 29) | (12 << 6) | 4,
     engine: WasmerEngine::Universal,
     compiler: WasmerCompiler::Singlepass,
 };

runtime/near-vm-runner/src/wasmtime_runner.rs

@@ -120,7 +120,9 @@ impl IntoVMError for anyhow::Error {
             };
             return Err(VMRunnerError::Nondeterministic(nondeterministic_message.into()));
         }
-        Ok(FunctionCallError::LinkError { msg: format!("{:#?}", cause) })
+        // FIXME: this can blow up in size and would get stored in the storage in case this was a
+        // production runtime. Something more proper should be done here.
+        Ok(FunctionCallError::LinkError { msg: format!("{:?}", cause) })
     }
 }