fix: revert part of #4181 to classify FailedWithNoError as determinis…

…tic (#4278) * fix: revert part of #4181 to classify FailedWithNoError as deterministic * bump version
near · May 6, 2021 · daf13dd · daf13dd
1 parent 39af874
commit daf13dd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/neard/Cargo.toml b/neard/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "neard"
-version = "1.19.0-rc.1"
+version = "1.19.0-rc.2"
 authors = ["Near Inc <hello@nearprotocol.com>"]
 edition = "2018"
 default-run = "neard"

diff --git a/runtime/near-vm-runner/src/wasmer_runner.rs b/runtime/near-vm-runner/src/wasmer_runner.rs
@@ -101,7 +101,21 @@ impl IntoVMError for wasmer_runtime::error::RuntimeError {
                 // Failed unwinder may happen in the case of deep recursion/stack overflow.
                 // Also can be thrown on unreachable instruction, which is quite unfortunate.
                 InvokeError::FailedWithNoError => VMError::FunctionCallError(
-                    FunctionCallError::Nondeterministic("FailedWithNoError".to_string()),
+                    // XXX: this is a hot-fix. Initially, we treated this error
+                    // case as a normal one (so, we stored this error in our
+                    // state, etc.)
+                    //
+                    // Then, in
+                    // https://github.com/near/nearcore/pull/4181#discussion_r606267838
+                    // we reasoned that this error actually happens
+                    // non-deterministically, so it's better to panic in this
+                    // case.
+                    //
+                    // However, when rolling this out, we noticed that this
+                    // error happens deterministically for at least one
+                    // contract, so here we flip it back to some deterministic
+                    // error, which won't cause the node to panic.
+                    FunctionCallError::WasmTrap(WasmTrap::Unreachable)
                 ),
                 // Indicates that a trap occurred that is not known to Wasmer.
                 // As of 0.17.0, thrown only from Cranelift BE.