fix revert not interrupt execution (#2)

FISCO-BCOS · Jun 5, 2023 · 922d385 · 922d385
1 parent 16c6674
commit 922d385
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/fbei.rs b/src/fbei.rs
@@ -1,6 +1,7 @@
 use crate::Error;
 use evmc_vm::{
-    Bytes32, ExecutionMessage, MessageFlags, MessageKind, StatusCode, StorageStatus, Uint256, Address,
+    Address, Bytes32, ExecutionMessage, MessageFlags, MessageKind, StatusCode, StorageStatus,
+    Uint256,
 };
 use log::{debug, log_enabled, Level};
 use sha3::Digest;
@@ -329,7 +330,11 @@ impl EnvInterface for EnvironmentInterface {
         let caller = "revert";
         match &self.wasm_memory {
             Some(wasm_memory) => {
-                wasm_memory_read(wasm_memory, &store, data_offset as usize, buffer, caller)
+                if self.host_context.get_host_context().version >= 0x03040000 {
+                    Err(Error::Revert(String::from_utf8_lossy(buffer).to_string()))
+                } else {
+                    wasm_memory_read(wasm_memory, &store, data_offset as usize, buffer, caller)
+                }
             }
             None => Err(Error::VMInternalError(format!(
                 "{} failed, no wasm_memory",

diff --git a/src/lib.rs b/src/lib.rs
@@ -58,6 +58,7 @@ pub enum Error {
     InvalidParameter(String),
     VMInternalError(String),
     InvalidReturnStatus(i32),
+    Revert(String),
 }
 
 impl fmt::Display for Error {
@@ -67,6 +68,7 @@ impl fmt::Display for Error {
             Error::InvalidParameter(message) => write!(f, "InvalidParameter, {}", message),
             Error::VMInternalError(message) => write!(f, "VMInternalError, {}", message),
             Error::InvalidReturnStatus(code) => write!(f, "InvalidReturnStatus, {}", code),
+            Error::Revert(message) => write!(f, "Revert, {}", message),
         }
     }
 }