feat(runtime): Wasmer 1.0 runner

Cargo.toml

@@ -112,6 +112,8 @@ delay_detector = ["neard/delay_detector"]
 rosetta_rpc = ["neard/rosetta_rpc"]
 protocol_feature_forward_chunk_parts = ["neard/protocol_feature_forward_chunk_parts"]
 nightly_protocol = ["near-primitives/nightly_protocol", "near-jsonrpc/nightly_protocol"]
+wasmtime_vm = ["neard/wasmtime_vm"]
+wasmer1_vm = ["neard/wasmer1_vm"]
 nightly_protocol_features = ["nightly_protocol", "neard/nightly_protocol_features", "protocol_feature_evm", "protocol_feature_block_ordinal"]
 protocol_feature_evm = ["neard/protocol_feature_evm", "testlib/protocol_feature_evm", "runtime-params-estimator/protocol_feature_evm"]
 protocol_feature_block_ordinal = ["neard/protocol_feature_block_ordinal", "near-primitives/protocol_feature_block_ordinal"]

deny.toml

@@ -137,4 +137,17 @@ skip = [
 
     { name = "parking_lot", version = "=0.9.0" },
 
+    # wasmer 1.0 use some newer version of crates than wasmer 0.17 & wasmtime, old ones are skipped here
+    { name = "cranelift-bforest", version = "=0.67.0" },
+    { name = "cranelift-codegen", version = "=0.67.0" },
+    { name = "cranelift-codegen-meta", version = "=0.67.0" },
+    { name = "cranelift-codegen-shared", version = "=0.67.0" },
+    { name = "cranelift-entity", version = "=0.67.0" },
+    { name = "cranelift-frontend", version = "=0.67.0" },
+    { name = "gimli", version = "=0.21.0" },
+    { name = "libloading", version = "=0.5.2" },
+    { name = "regalloc", version = "=0.0.30" },
+    { name = "strsim", version = "=0.8.0" },
+    { name = "wasmparser", version = "=0.57.0" },
+    { name = "which", version = "=3.1.1" },
 ]

neard/Cargo.toml

@@ -67,6 +67,8 @@ protocol_feature_evm = ["near-primitives/protocol_feature_evm", "node-runtime/pr
 protocol_feature_block_ordinal = ["near-primitives/protocol_feature_block_ordinal"]
 nightly_protocol_features = ["nightly_protocol", "near-primitives/nightly_protocol_features", "near-client/nightly_protocol_features", "near-epoch-manager/nightly_protocol_features", "near-store/nightly_protocol_features", "protocol_feature_forward_chunk_parts", "protocol_feature_rectify_inflation", "protocol_feature_evm"]
 nightly_protocol = ["near-primitives/nightly_protocol", "near-jsonrpc/nightly_protocol"]
+wasmtime_vm = ["node-runtime/wasmtime_vm"]
+wasmer1_vm = ["node-runtime/wasmer1_vm"]
 costs_counting = ["node-runtime/costs_counting"]
 
 [[bin]]

runtime/near-vm-errors/src/lib.rs

@@ -36,6 +36,12 @@ pub enum FunctionCallError {
     WasmUnknownError,
     HostError(HostError),
     EvmError(EvmError),
+    /// An error message when wasmer 1.0 returns a wasmer::RuntimeError
+    WasmerRuntimeError(String),
+    /// A trap in Wasmer 1.0, not same as WasmTrap above, String is a machine readable form like "stk_ovf"
+    /// String is used instead of wasmer internal enum is because of BorshSerializable.
+    /// It can be convert back by wasmer_vm::TrapCode::from_str
+    Wasmer1Trap(String),
 }
 #[derive(
     Debug, Clone, PartialEq, Eq, BorshDeserialize, BorshSerialize, Deserialize, Serialize, RpcError,
@@ -278,6 +284,8 @@ pub enum VMLogicError {
     EvmError(EvmError),
 }
 
+impl std::error::Error for VMLogicError {}
+
 /// An error that is caused by an operation on an inconsistent state.
 /// E.g. a deserialization error or an integer overflow.
 #[derive(Debug, Clone, PartialEq, Eq, BorshDeserialize, BorshSerialize, Deserialize, Serialize)]
@@ -342,6 +350,8 @@ impl fmt::Display for FunctionCallError {
                 write!(f, "Unknown error during Wasm contract execution")
             }
             FunctionCallError::EvmError(e) => write!(f, "EVM: {:?}", e),
+            FunctionCallError::WasmerRuntimeError(e) => write!(f, "Wasmer Runtime: {}", e),
+            FunctionCallError::Wasmer1Trap(e) => write!(f, "Wasmer 1.0 trap: {}", e),
         }
     }
 }

runtime/near-vm-logic/Cargo.toml

@@ -30,10 +30,11 @@ num-rational = { version = "0.2.4" }
 serde_json = {version= "1", features= ["preserve_order"]}
 
 [features]
-default = ["costs_counting"]
+default = ["costs_counting", "wasmer_default"]
 protocol_feature_evm = ["near-runtime-fees/protocol_feature_evm"]
+wasmer_default = []
 wasmtime_default = []
-
+wasmer1_default = []
 
 # Use this feature to enable counting of fees and costs applied.
 costs_counting = []

runtime/near-vm-logic/src/config.rs

@@ -7,26 +7,59 @@ use std::hash::{Hash, Hasher};
 
 #[derive(Clone, Copy, Debug, Hash, Serialize, Deserialize, BorshSerialize, BorshDeserialize)]
 pub enum VMKind {
-    /// Wasmer VM.
-    Wasmer,
+    /// Wasmer 0.17.x VM.
+    Wasmer0,
     /// Wasmtime VM.
     Wasmtime,
+    /// Wasmer 1.x VM.
+    Wasmer1,
 }
 
 impl Default for VMKind {
-    #[cfg(feature = "wasmer_default")]
+    #[cfg(all(
+        feature = "wasmer_default",
+        not(feature = "wasmer1_default"),
+        not(feature = "wasmtime_default")
+    ))]
     fn default() -> Self {
-        VMKind::Wasmer
+        VMKind::Wasmer0
     }
 
-    #[cfg(feature = "wasmtime_default")]
+    #[cfg(all(
+        not(feature = "wasmer_default"),
+        feature = "wasmer1_default",
+        not(feature = "wasmtime_default")
+    ))]
+    fn default() -> Self {
+        VMKind::Wasmer1
+    }
+
+    #[cfg(all(
+        not(feature = "wasmer_default"),
+        not(feature = "wasmer1_default"),
+        feature = "wasmtime_default"
+    ))]
     fn default() -> Self {
         VMKind::Wasmtime
     }
 
-    #[cfg(all(not(feature = "wasmer_default"), not(feature = "wasmtime_default")))]
+    #[cfg(all(
+        not(feature = "wasmer_default"),
+        not(feature = "wasmer1_default"),
+        not(feature = "wasmtime_default")
+    ))]
+    fn default() -> Self {
+        VMKind::Wasmer0
+    }
+
+    // These features should be mutually exclusive, but implement this to --all-features
+    #[cfg(all(
+        feature = "wasmer_default",
+        feature = "wasmer1_default",
+        feature = "wasmtime_default"
+    ))]
     fn default() -> Self {
-        VMKind::Wasmer
+        VMKind::Wasmer0
     }
 }
 

runtime/near-vm-runner-standalone/Cargo.toml

@@ -26,7 +26,7 @@ strum = "0.18"
 num-rational = { version = "0.2.4" }
 
 near-vm-logic = { path = "../near-vm-logic", version = "2.3.0", features = ["costs_counting"]}
-near-vm-runner = { path = "../near-vm-runner", version = "2.3.0", features = ["wasmtime_vm"] }
+near-vm-runner = { path = "../near-vm-runner", version = "2.3.0", features = ["wasmtime_vm", "wasmer1_vm"] }
 near-runtime-fees = { path = "../near-runtime-fees", version = "2.3.0" }
 
 [features]

runtime/near-vm-runner-standalone/src/main.rs

@@ -183,7 +183,8 @@ fn main() {
     let vm_kind: VMKind = match matches.value_of("vm-kind") {
         Some(value) => match value {
             "wasmtime" => VMKind::Wasmtime,
-            "wasmer" => VMKind::Wasmer,
+            "wasmer" => VMKind::Wasmer0,
+            "wasmer1" => VMKind::Wasmer1,
             _ => VMKind::default(),
         },
         None => VMKind::default(),

runtime/near-vm-runner/Cargo.toml

@@ -16,6 +16,9 @@ This crate implements the specification of the interface that Near blockchain ex
 borsh = "0.7.1"
 wasmer-runtime = { version="0.17.1", features = ["default-backend-singlepass"], default-features = false, package = "wasmer-runtime-near" }
 wasmer-runtime-core = {version = "0.17.1", package = "wasmer-runtime-core-near" }
+wasmer = { git = "https://github.com/wasmerio/wasmer", rev="b4d2d8ee804a45850af2b3e012fdbbbdcb1185cb", optional = true }
+wasmer-types = { git = "https://github.com/wasmerio/wasmer", rev="b4d2d8ee804a45850af2b3e012fdbbbdcb1185cb", optional = true }
+wasmer-compiler-singlepass = { git = "https://github.com/wasmerio/wasmer", rev="b4d2d8ee804a45850af2b3e012fdbbbdcb1185cb", optional = true }
 pwasm-utils = "0.12"
 parity-wasm = "0.41"
 wasmtime = { version = "0.20.0", default-features = false, optional = true }
@@ -33,11 +36,13 @@ wabt = "0.9"
 bencher = "^0.1.5"
 
 [features]
-default = [ "wasmer_default" ]
+default = [ "wasmer_default", "wasmer", "wasmer-types" ]
 wasmtime_vm = [ "wasmtime", "anyhow"]
+wasmer1_vm = [ "wasmer", "wasmer-types", "wasmer-compiler-singlepass" ]
 lightbeam = ["wasmtime/lightbeam"]
 wasmer_default = []
 wasmtime_default = ["wasmtime_vm"]
+wasmer1_default = [ "wasmer1_vm" ]
 no_cpu_compatibility_checks = []
 protocol_feature_evm = ["near-runtime-fees/protocol_feature_evm", "near-evm-runner/protocol_feature_evm"]
 

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

@@ -102,7 +102,7 @@ pub(crate) fn compile_module_cached_wasmer(
     if cache.is_none() {
         return compile_module(wasm_code, config);
     }
-    let key = get_key(wasm_code_hash, wasm_code, VMKind::Wasmer, config);
+    let key = get_key(wasm_code_hash, wasm_code, VMKind::Wasmer0, config);
     let cache = cache.unwrap();
     match cache.get(&(key.0).0) {
         Ok(serialized) => match serialized {

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

@@ -1,5 +1,17 @@
-use near_vm_errors::VMError;
-
+use near_vm_errors::{FunctionCallError, VMError, VMLogicError};
 pub trait IntoVMError {
     fn into_vm_error(self) -> VMError;
 }
+
+impl IntoVMError for &VMLogicError {
+    fn into_vm_error(self) -> VMError {
+        match self {
+            VMLogicError::HostError(h) => {
+                VMError::FunctionCallError(FunctionCallError::HostError(h.clone()))
+            }
+            VMLogicError::ExternalError(s) => VMError::ExternalError(s.clone()),
+            VMLogicError::InconsistentStateError(e) => VMError::InconsistentStateError(e.clone()),
+            VMLogicError::EvmError(_) => unreachable!("Wasm can't return EVM error"),
+        }
+    }
+}

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

@@ -2,10 +2,18 @@ use near_vm_logic::VMLogic;
 
 use std::ffi::c_void;
 
-struct ImportReference(*mut c_void);
+#[derive(Clone)]
+pub struct ImportReference(pub *mut c_void);
 unsafe impl Send for ImportReference {}
 unsafe impl Sync for ImportReference {}
 
+use wasmer::{Memory, WasmerEnv};
+#[derive(WasmerEnv, Clone)]
+pub struct MyEnv {
+    pub memory: Memory,
+    pub logic: ImportReference,
+}
+
 // Wasm has only i32/i64 types, so Wasmtime 0.17 only accepts
 // external functions taking i32/i64 type.
 // Remove, once using version with https://github.com/bytecodealliance/wasmtime/issues/1829
@@ -38,6 +46,21 @@ macro_rules! wrapped_imports {
             )*
             }
 
+            #[cfg(feature = "wasmer1_vm")]
+            pub mod wasmer1_ext {
+            use near_vm_logic::VMLogic;
+            use crate::imports::MyEnv;
+
+            type VMResult<T> = ::std::result::Result<T, near_vm_logic::VMLogicError>;
+            $(
+                #[allow(unused_parens)]
+                pub fn $func(env: &MyEnv, $( $arg_name: $arg_type ),* ) -> VMResult<($( $returns ),*)> {
+                    let logic: &mut VMLogic = unsafe { &mut *(env.logic.0 as *mut VMLogic<'_>) };
+                    logic.$func( $( $arg_name, )* )
+                }
+            )*
+            }
+
             #[cfg(feature = "wasmtime_vm")]
             pub mod wasmtime_ext {
             use near_vm_logic::{VMLogic, VMLogicError};
@@ -94,6 +117,20 @@ macro_rules! wrapped_imports {
                 }
             }
 
+            #[cfg(feature = "wasmer1_vm")]
+            pub(crate) fn build_wasmer1(store: &wasmer::Store, memory: wasmer::Memory, logic: &mut VMLogic<'_>) ->
+                wasmer::ImportObject {
+                let env = MyEnv {logic: ImportReference(logic as * mut _ as * mut c_void), memory: memory.clone()};
+                wasmer::imports! {
+                    "env" => {
+                        "memory" => memory,
+                        $(
+                            stringify!($func) => wasmer::Function::new_native_with_env(&store, env.clone(), wasmer1_ext::$func),
+                        )*
+                    },
+                }
+            }
+
             #[cfg(feature = "wasmtime_vm")]
             pub(crate) fn link_wasmtime(
                     linker: &mut wasmtime::Linker,

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

@@ -5,8 +5,13 @@ mod memory;
 pub mod prepare;
 mod runner;
 mod wasmer_runner;
+
 #[cfg(feature = "wasmtime_vm")]
 mod wasmtime_runner;
+
+#[cfg(feature = "wasmer1_vm")]
+mod wasmer1_runner;
+
 pub use near_vm_errors::VMError;
 pub use runner::compile_module;
 pub use runner::run;