improvement: add logs & return value to revert

bluealloy · Jan 25, 2023 · 81310b9 · 81310b9
1 parent 6bdc8b9
commit 81310b9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/crates/primitives/src/result.rs b/crates/primitives/src/result.rs
@@ -24,7 +24,11 @@ pub enum ExecutionResult {
         output: Output,
     },
     /// Reverted by `REVERT` opcode that doesn't spend all gas.
-    Revert { gas_used: u64 },
+    Revert {
+        gas_used: u64,
+        logs: Vec<Log>,
+        return_value: Bytes,
+    },
     /// Reverted for various reasons and spend all gas.
     Halt {
         reason: Halt,
@@ -51,7 +55,7 @@ impl ExecutionResult {
 
     pub fn gas_used(&self) -> u64 {
         let (Self::Success { gas_used, .. }
-        | Self::Revert { gas_used }
+        | Self::Revert { gas_used, .. }
         | Self::Halt { gas_used, .. }) = self;
 
         *gas_used

diff --git a/crates/revm/src/evm_impl.rs b/crates/revm/src/evm_impl.rs
@@ -225,7 +225,14 @@ impl<'a, GSPEC: Spec, DB: Database, const INSPECT: bool> Transact<DB::Error>
                 logs,
                 output,
             },
-            SuccessOrHalt::Revert => ExecutionResult::Revert { gas_used },
+            SuccessOrHalt::Revert => ExecutionResult::Revert {
+                gas_used,
+                logs,
+                return_value: match output {
+                    Output::Call(return_value) => return_value,
+                    Output::Create(return_value, _) => return_value,
+                },
+            },
             SuccessOrHalt::Halt(reason) => ExecutionResult::Halt { reason, gas_used },
             SuccessOrHalt::FatalExternalError => {
                 return Err(EVMError::Database(self.data.error.take().unwrap()))