feat(runtime): upgrade to Wasmer 0.17 and nightly 2020-05-15

Used https://crates.io/crates/rust-latest to find latest suitable nightly. Fixes #2055 Test plan --------- cargo test --all
near · May 18, 2020 · 5aff965 · 5aff965
1 parent 48fa6b4
commit 5aff965
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 70 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/runtime/near-vm-errors/src/lib.rs b/runtime/near-vm-errors/src/lib.rs
@@ -47,6 +47,10 @@ pub enum WasmTrap {
     IllegalArithmetic,
     /// Misaligned atomic access trap.
     MisalignedAtomicAccess,
+    /// Breakpoint trap.
+    BreakpointTrap,
+    /// Generic trap.
+    GenericTrap,
 }
 
 #[derive(
@@ -244,6 +248,8 @@ impl fmt::Display for WasmTrap {
                 write!(f, "An arithmetic exception, e.g. divided by zero.")
             }
             WasmTrap::MisalignedAtomicAccess => write!(f, "Misaligned atomic access trap."),
+            WasmTrap::GenericTrap => write!(f, "Generic trap."),
+            WasmTrap::BreakpointTrap => write!(f, "Breakpoint trap."),
         }
     }
 }

diff --git a/runtime/near-vm-runner/Cargo.toml b/runtime/near-vm-runner/Cargo.toml
@@ -14,8 +14,8 @@ This crate implements the specification of the interface that Near blockchain ex
 
 [dependencies]
 cached = "0.12"
-wasmer-runtime = { version = "0.13.1", features = ["default-backend-singlepass"], default-features = false }
-wasmer-runtime-core = { version = "0.13.1" }
+wasmer-runtime = { version = "0.17", features = ["default-backend-singlepass"], default-features = false }
+wasmer-runtime-core = { version = "0.17" }
 pwasm-utils = "0.12"
 parity-wasm = "0.41"
 

diff --git a/runtime/near-vm-runner/src/errors.rs b/runtime/near-vm-runner/src/errors.rs
@@ -1,4 +1,4 @@
-use near_vm_errors::FunctionCallError::WasmUnknownError;
+use near_vm_errors::FunctionCallError::{WasmTrap, WasmUnknownError};
 use near_vm_errors::{CompilationError, FunctionCallError, MethodResolveError, VMError};
 use near_vm_logic::VMLogicError;
 
@@ -65,10 +65,31 @@ impl IntoVMError for wasmer_runtime::error::ResolveError {
 
 impl IntoVMError for wasmer_runtime::error::RuntimeError {
     fn into_vm_error(self) -> VMError {
+        use near_vm_errors::WasmTrap::{BreakpointTrap, GenericTrap};
+        use wasmer_runtime::error::InvokeError;
         use wasmer_runtime::error::RuntimeError;
         match &self {
-            RuntimeError::Trap { msg: _ } => VMError::FunctionCallError(WasmUnknownError),
-            RuntimeError::Error { data } => {
+            RuntimeError::InvokeError(invoke_error) => match invoke_error {
+                InvokeError::FailedWithNoError => VMError::FunctionCallError(WasmUnknownError),
+                InvokeError::UnknownTrap { address: _, signal: _ } => {
+                    VMError::FunctionCallError(WasmTrap(GenericTrap))
+                }
+                InvokeError::TrapCode { code: _, srcloc: _ } => {
+                    VMError::FunctionCallError(WasmTrap(GenericTrap))
+                }
+                InvokeError::UnknownTrapCode { trap_code: _, srcloc: _ } => {
+                    VMError::FunctionCallError(WasmTrap(GenericTrap))
+                }
+                InvokeError::EarlyTrap(_) => VMError::FunctionCallError(WasmTrap(GenericTrap)),
+                InvokeError::Breakpoint(_) => VMError::FunctionCallError(WasmTrap(BreakpointTrap)),
+            },
+            RuntimeError::Metering(_x) => {
+                panic!("Support metering errors properly");
+            }
+            RuntimeError::InstanceImage(_x) => {
+                panic!("Support instance image errors properly");
+            }
+            RuntimeError::User(data) => {
                 if let Some(err) = data.downcast_ref::<VMLogicError>() {
                     match err {
                         VMLogicError::HostError(h) => {
@@ -80,12 +101,11 @@ impl IntoVMError for wasmer_runtime::error::RuntimeError {
                         }
                     }
                 } else {
-                    eprintln!(
+                    panic!(
                         "Bad error case! Output is non-deterministic {:?} {:?}",
                         data.type_id(),
                         self.to_string()
                     );
-                    VMError::FunctionCallError(WasmUnknownError)
                 }
             }
         }

diff --git a/runtime/runtime-params-estimator/src/lib.rs b/runtime/runtime-params-estimator/src/lib.rs
@@ -1,4 +1,4 @@
-#![feature(asm)]
+#![feature(llvm_asm)]
 
 // Lists all cases that we want to measure.
 pub mod cases;