feat(runtime): Wasmer 1.0 runner

Cargo.toml

@@ -114,3 +114,5 @@ protocol_feature_forward_chunk_parts = ["neard/protocol_feature_forward_chunk_pa
 nightly_protocol = ["near-primitives/nightly_protocol", "near-jsonrpc/nightly_protocol"]
 nightly_protocol_features = ["nightly_protocol", "neard/nightly_protocol_features", "protocol_feature_evm"]
 protocol_feature_evm = ["neard/protocol_feature_evm", "testlib/protocol_feature_evm", "near-runtime-standalone/protocol_feature_evm", "runtime-params-estimator/protocol_feature_evm"]
+wasmtime_vm = ["neard/wasmtime_vm"]
+wasmer1_vm = ["neard/wasmer1_vm"]

neard/Cargo.toml

@@ -66,6 +66,8 @@ protocol_feature_rectify_inflation = ["near-epoch-manager/protocol_feature_recti
 protocol_feature_evm = ["near-primitives/protocol_feature_evm", "node-runtime/protocol_feature_evm", "near-chain-configs/protocol_feature_evm", "near-chain/protocol_feature_evm"]
 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"]
 
 [[bin]]
 path = "src/main.rs"

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

@@ -36,6 +36,11 @@ pub enum FunctionCallError {
     WasmUnknownError,
     HostError(HostError),
     EvmError(EvmError),
+    /// An error message when wasmer 1.0 returns a wasmer::RuntimeError
+    /// In wasmer 1.0 the internal of runtime error is not pub, so we cannot tell it's a UserError
+    /// or Trap, and which kind of Trap. The pub thing we have is a error message returns by wasmer,
+    /// Indicate the reason of RuntimeError, and if it's a Trap what kind of trap it is.
+    WasmerRuntimeError(String),
 }
 #[derive(
     Debug, Clone, PartialEq, Eq, BorshDeserialize, BorshSerialize, Deserialize, Serialize, RpcError,
@@ -272,6 +277,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)]
@@ -336,6 +343,7 @@ 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),
         }
     }
 }

runtime/near-vm-logic/Cargo.toml

@@ -32,7 +32,7 @@ serde_json = {version= "1", features= ["preserve_order"]}
 default = ["costs_counting"]
 protocol_feature_evm = ["near-runtime-fees/protocol_feature_evm"]
 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,10 +7,12 @@ use std::hash::{Hash, Hasher};
 
 #[derive(Clone, Copy, Debug, Hash, Serialize, Deserialize, BorshSerialize, BorshDeserialize)]
 pub enum VMKind {
-    /// Wasmer VM.
+    /// Wasmer 0.17.x VM.
     Wasmer,
     /// Wasmtime VM.
     Wasmtime,
+    /// Wasmer 1.x VM.
+    Wasmer1,
 }
 
 impl Default for VMKind {
@@ -19,12 +21,21 @@ impl Default for VMKind {
         VMKind::Wasmer
     }
 
+    #[cfg(feature = "wasmer1_default")]
+    fn default() -> Self {
+        VMKind::Wasmer1
+    }
+
     #[cfg(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::Wasmer
     }

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

@@ -187,6 +187,7 @@ fn main() {
         Some(value) => match value {
             "wasmtime" => VMKind::Wasmtime,
             "wasmer" => VMKind::Wasmer,
+            "wasmer1" => VMKind::Wasmer1,
             _ => VMKind::default(),
         },
         None => VMKind::default(),

runtime/near-vm-runner/Cargo.toml

@@ -16,6 +16,8 @@ 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 = { version = "1.0.0", features = ["singlepass"], optional = true }
+wasmer-types = { version = "1.0.0", optional = true}
 pwasm-utils = "0.12"
 parity-wasm = "0.41"
 wasmtime = { version = "0.20.0", default-features = false, optional = true }
@@ -33,11 +35,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" ]
 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/imports.rs

@@ -6,6 +6,11 @@ struct ImportReference(*mut c_void);
 unsafe impl Send for ImportReference {}
 unsafe impl Sync for ImportReference {}
 
+#[derive(Clone)]
+pub struct VMLogicReference(pub *mut c_void);
+unsafe impl Send for VMLogicReference {}
+unsafe impl Sync for VMLogicReference {}
+
 // 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 +43,27 @@ macro_rules! wrapped_imports {
             )*
             }
 
+            #[cfg(feature = "wasmer1_vm")]
+            pub mod wasmer1_ext {
+            use near_vm_logic::VMLogic;
+            use wasmer::{WasmerEnv, Memory};
+            use crate::imports::VMLogicReference;
+            #[derive(WasmerEnv, Clone)]
+            pub struct MyEnv {
+                pub memory: Memory,
+                pub logic: VMLogicReference,
+            }
+
+            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 +120,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 = wasmer1_ext::MyEnv {logic: VMLogicReference(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;

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

@@ -56,8 +56,13 @@ pub fn run_vm<'a>(
     cache: Option<&'a dyn CompiledContractCache>,
 ) -> (Option<VMOutcome>, Option<VMError>) {
     use crate::wasmer_runner::run_wasmer;
+
     #[cfg(feature = "wasmtime_vm")]
     use crate::wasmtime_runner::wasmtime_runner::run_wasmtime;
+
+    #[cfg(feature = "wasmer1_vm")]
+    use crate::wasmer1_runner::run_wasmer1;
+
     match vm_kind {
         VMKind::Wasmer => run_wasmer(
             code_hash,
@@ -90,6 +95,22 @@ pub fn run_vm<'a>(
         VMKind::Wasmtime => {
             panic!("Wasmtime is not supported, compile with '--features wasmtime_vm'")
         }
+        #[cfg(feature = "wasmer1_vm")]
+        VMKind::Wasmer1 => run_wasmer1(
+            code_hash,
+            code,
+            method_name,
+            ext,
+            context,
+            wasm_config,
+            fees_config,
+            promise_results,
+            None,
+            current_protocol_version,
+            cache,
+        ),
+        #[cfg(not(feature = "wasmer1_vm"))]
+        VMKind::Wasmer1 => panic!("Wasmer1 is not supported, compile with '--features wasmer1_vm'"),
     }
 }
 
@@ -108,8 +129,12 @@ pub fn run_vm_profiled<'a>(
     cache: Option<&'a dyn CompiledContractCache>,
 ) -> (Option<VMOutcome>, Option<VMError>) {
     use crate::wasmer_runner::run_wasmer;
+
     #[cfg(feature = "wasmtime_vm")]
     use crate::wasmtime_runner::wasmtime_runner::run_wasmtime;
+
+    #[cfg(feature = "wasmer1_vm")]
+    use crate::wasmer1_runner::run_wasmer1;
     match vm_kind {
         VMKind::Wasmer => run_wasmer(
             code_hash,
@@ -142,13 +167,33 @@ pub fn run_vm_profiled<'a>(
         VMKind::Wasmtime => {
             panic!("Wasmtime is not supported, compile with '--features wasmtime_vm'")
         }
+        #[cfg(feature = "wasmer1_vm")]
+        VMKind::Wasmer1 => run_wasmer1(
+            code_hash,
+            code,
+            method_name,
+            ext,
+            context,
+            wasm_config,
+            fees_config,
+            promise_results,
+            Some(profile),
+            current_protocol_version,
+            cache,
+        ),
+        #[cfg(not(feature = "wasmer1_vm"))]
+        VMKind::Wasmer1 => panic!("Wasmer1 is not supported, compile with '--features wasmer1_vm'"),
     }
 }
 
 pub fn with_vm_variants(runner: fn(VMKind) -> ()) {
     runner(VMKind::Wasmer);
+
     #[cfg(feature = "wasmtime_vm")]
     runner(VMKind::Wasmtime);
+
+    #[cfg(feature = "wasmer1_vm")]
+    runner(VMKind::Wasmer1);
 }
 
 /// Used for testing cost of compiling a module
@@ -167,6 +212,13 @@ pub fn compile_module(vm_kind: VMKind, code: &Vec<u8>) -> bool {
         VMKind::Wasmtime => {
             panic!("Wasmtime is not supported, compile with '--features wasmtime_vm'")
         }
+        #[cfg(feature = "wasmer1_vm")]
+        VMKind::Wasmer1 => {
+            use crate::wasmer1_runner::compile_module;
+            compile_module(code)
+        }
+        #[cfg(not(feature = "wasmer1_vm"))]
+        VMKind::Wasmer1 => panic!("Wasmer1 is not supported, compile with '--features wasm1_vm'"),
     };
     false
 }