refactor!: add logs to Revert and Halt variants of ExecutionResult

crates/context/interface/src/result.rs

@@ -287,6 +287,8 @@ pub enum ExecutionResult<HaltReasonTy = HaltReason> {
     Revert {
         /// Gas accounting for the transaction.
         gas: ResultGas,
+        /// Logs emitted before the revert.
+        logs: Vec<Log>,
         /// Output of the transaction.
         output: Bytes,
     },
@@ -299,6 +301,8 @@ pub enum ExecutionResult<HaltReasonTy = HaltReason> {
         /// For standard EVM halts, gas used typically equals the gas limit.
         /// Some system- or L2-specific halts may intentionally report less gas used.
         gas: ResultGas,
+        /// Logs emitted before the halt.
+        logs: Vec<Log>,
     },
 }
 
@@ -329,10 +333,11 @@ impl<HaltReasonTy> ExecutionResult<HaltReasonTy> {
                 logs,
                 output,
             },
-            Self::Revert { gas, output } => ExecutionResult::Revert { gas, output },
-            Self::Halt { reason, gas } => ExecutionResult::Halt {
+            Self::Revert { gas, logs, output } => ExecutionResult::Revert { gas, logs, output },
+            Self::Halt { reason, gas, logs } => ExecutionResult::Halt {
                 reason: op(reason),
                 gas,
+                logs,
             },
         }
     }
@@ -373,19 +378,21 @@ impl<HaltReasonTy> ExecutionResult<HaltReasonTy> {
         }
     }
 
-    /// Returns the logs if execution is successful, or an empty list otherwise.
+    /// Returns the logs emitted during execution.
     pub fn logs(&self) -> &[Log] {
         match self {
-            Self::Success { logs, .. } => logs.as_slice(),
-            _ => &[],
+            Self::Success { logs, .. } | Self::Revert { logs, .. } | Self::Halt { logs, .. } => {
+                logs.as_slice()
+            }
         }
     }
 
-    /// Consumes [`self`] and returns the logs if execution is successful, or an empty list otherwise.
+    /// Consumes [`self`] and returns the logs emitted during execution.
     pub fn into_logs(self) -> Vec<Log> {
         match self {
-            Self::Success { logs, .. } => logs,
-            _ => Vec::new(),
+            Self::Success { logs, .. } | Self::Revert { logs, .. } | Self::Halt { logs, .. } => {
+                logs
+            }
         }
     }
 
@@ -422,15 +429,32 @@ impl<HaltReasonTy: fmt::Display> fmt::Display for ExecutionResult<HaltReasonTy>
                 }
                 write!(f, ", {output}")
             }
-            Self::Revert { gas, output } => {
+            Self::Revert { gas, logs, output } => {
                 write!(f, "Revert: {gas}")?;
+                if !logs.is_empty() {
+                    write!(
+                        f,
+                        ", {} log{}",
+                        logs.len(),
+                        if logs.len() == 1 { "" } else { "s" }
+                    )?;
+                }
                 if !output.is_empty() {
                     write!(f, ", {} bytes output", output.len())?;
                 }
                 Ok(())
             }
-            Self::Halt { reason, gas } => {
-                write!(f, "Halted: {reason} ({gas})")
+            Self::Halt { reason, gas, logs } => {
+                write!(f, "Halted: {reason} ({gas})")?;
+                if !logs.is_empty() {
+                    write!(
+                        f,
+                        ", {} log{}",
+                        logs.len(),
+                        if logs.len() == 1 { "" } else { "s" }
+                    )?;
+                }
+                Ok(())
             }
         }
     }
@@ -1071,6 +1095,7 @@ mod tests {
 
         let result: ExecutionResult<HaltReason> = ExecutionResult::Revert {
             gas: ResultGas::new(100000, 100000, 0, 0, 0),
+            logs: vec![],
             output: Bytes::from(vec![1, 2, 3, 4]),
         };
         assert_eq!(
@@ -1081,6 +1106,7 @@ mod tests {
         let result: ExecutionResult<HaltReason> = ExecutionResult::Halt {
             reason: HaltReason::OutOfGas(OutOfGasError::Basic),
             gas: ResultGas::new(1000000, 1000000, 0, 0, 0),
+            logs: vec![],
         };
         assert_eq!(
             result.to_string(),

crates/ee-tests/src/op_revm_tests.rs

@@ -105,6 +105,7 @@ fn test_halted_deposit_tx() {
                 0,
                 0,
             ),
+            logs: vec![],
         }
     );
     assert_eq!(

crates/ee-tests/tests/op_revm_testdata/test_halted_deposit_tx.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 0,
         "limit": 16777216
       },
+      "logs": [],
       "reason": "FailedDeposit"
     }
   },

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_g1_add_input_wrong_size.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 21000,
         "limit": 21375
       },
+      "logs": [],
       "reason": {
         "Base": {
           "PrecompileErrorWithContext": "bls12-381 g1 add input length error"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_g1_add_out_of_gas.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 21000,
         "limit": 21374
       },
+      "logs": [],
       "reason": {
         "Base": {
           "OutOfGas": "Precompile"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_g1_msm_input_wrong_size.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 23544,
         "limit": 35560
       },
+      "logs": [],
       "reason": {
         "Base": {
           "PrecompileErrorWithContext": "bls12-381 g1 msm input length error"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_g1_msm_out_of_gas.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 23560,
         "limit": 35559
       },
+      "logs": [],
       "reason": {
         "Base": {
           "OutOfGas": "Precompile"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_g1_msm_wrong_input_layout.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 23560,
         "limit": 35560
       },
+      "logs": [],
       "reason": {
         "Base": {
           "PrecompileErrorWithContext": "bls12-381 fp 64 top bytes of input are not zero"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_g2_add_input_wrong_size.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 21000,
         "limit": 21600
       },
+      "logs": [],
       "reason": {
         "Base": {
           "PrecompileErrorWithContext": "bls12-381 g2 add input length error"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_g2_add_out_of_gas.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 21000,
         "limit": 21599
       },
+      "logs": [],
       "reason": {
         "Base": {
           "OutOfGas": "Precompile"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_g2_msm_input_wrong_size.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 25592,
         "limit": 48108
       },
+      "logs": [],
       "reason": {
         "Base": {
           "PrecompileErrorWithContext": "bls12-381 g2 msm input length error"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_g2_msm_out_of_gas.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 25608,
         "limit": 48107
       },
+      "logs": [],
       "reason": {
         "Base": {
           "OutOfGas": "Precompile"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_g2_msm_wrong_input_layout.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 25608,
         "limit": 48108
       },
+      "logs": [],
       "reason": {
         "Base": {
           "PrecompileErrorWithContext": "bls12-381 fp 64 top bytes of input are not zero"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_map_fp2_to_g2_input_wrong_size.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 23032,
         "limit": 46848
       },
+      "logs": [],
       "reason": {
         "Base": {
           "PrecompileErrorWithContext": "bls12-381 map fp2 to g2 input length error"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_map_fp2_to_g2_out_of_gas.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 23048,
         "limit": 46847
       },
+      "logs": [],
       "reason": {
         "Base": {
           "OutOfGas": "Precompile"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_map_fp_to_g1_input_wrong_size.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 22008,
         "limit": 27524
       },
+      "logs": [],
       "reason": {
         "Base": {
           "PrecompileErrorWithContext": "bls12-381 map fp to g1 input length error"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_map_fp_to_g1_out_of_gas.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 22024,
         "limit": 27523
       },
+      "logs": [],
       "reason": {
         "Base": {
           "OutOfGas": "Precompile"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_pairing_input_wrong_size.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 27128,
         "limit": 97444
       },
+      "logs": [],
       "reason": {
         "Base": {
           "PrecompileErrorWithContext": "bls12-381 pairing input length error"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_pairing_out_of_gas.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 27144,
         "limit": 97443
       },
+      "logs": [],
       "reason": {
         "Base": {
           "OutOfGas": "Precompile"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bls12_381_pairing_wrong_input_layout.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 27144,
         "limit": 97444
       },
+      "logs": [],
       "reason": {
         "Base": {
           "PrecompileErrorWithContext": "bls12-381 fp 64 top bytes of input are not zero"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bn254_pair_fjord.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 1824024,
         "limit": 1824024
       },
+      "logs": [],
       "reason": {
         "Base": {
           "OutOfGas": "Precompile"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_bn254_pair_granite.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 1824024,
         "limit": 1824024
       },
+      "logs": [],
       "reason": {
         "Base": {
           "PrecompileErrorWithContext": "bn254 invalid pair length"

crates/ee-tests/tests/op_revm_testdata/test_halted_tx_call_p256verify.json

@@ -8,6 +8,7 @@
         "intrinsic_gas": 21000,
         "limit": 24449
       },
+      "logs": [],
       "reason": {
         "Base": {
           "OutOfGas": "Precompile"

crates/handler/src/post_execution.rs

@@ -115,6 +115,7 @@ pub fn output<CTX: ContextTr<Journal: JournalTr>, HALTREASON: HaltReasonTr>(
         },
         SuccessOrHalt::Revert => ExecutionResult::Revert {
             gas: result_gas,
+            logs,
             output: output.into_data(),
         },
         SuccessOrHalt::Halt(reason) => {
@@ -127,12 +128,14 @@ pub fn output<CTX: ContextTr<Journal: JournalTr>, HALTREASON: HaltReasonTr>(
                     return ExecutionResult::Halt {
                         reason: HALTREASON::from(HaltReason::PrecompileErrorWithContext(message)),
                         gas: result_gas,
+                        logs,
                     };
                 }
             }
             ExecutionResult::Halt {
                 reason,
                 gas: result_gas,
+                logs,
             }
         }
         // Only two internal return flags.

crates/op-revm/src/handler.rs

@@ -27,7 +27,7 @@ use revm::{
     interpreter::{interpreter::EthInterpreter, interpreter_action::FrameInit, Gas},
     primitives::{hardfork::SpecId, U256},
 };
-use std::boxed::Box;
+use std::{boxed::Box, vec::Vec};
 
 /// Optimism handler extends the [`Handler`] with Optimism specific logic.
 #[derive(Debug, Clone)]
@@ -424,6 +424,7 @@ where
             output = Ok(ExecutionResult::Halt {
                 reason: OpHaltReason::FailedDeposit,
                 gas: ResultGas::new(gas_limit, gas_used, 0, 0, 0),
+                logs: Vec::new(),
             })
         }
 

examples/custom_precompile_journal/src/main.rs

@@ -86,13 +86,13 @@ fn main() -> anyhow::Result<()> {
             let value = U256::from_be_slice(data);
             println!("   📖 Initial storage value: {value}");
         }
-        Ok(revm::context::result::ExecutionResult::Revert { output, gas }) => {
+        Ok(revm::context::result::ExecutionResult::Revert { output, gas, .. }) => {
             println!(
                 "   ❌ Reverted! Gas used: {}, Output: {output:?}",
                 gas.used()
             );
         }
-        Ok(revm::context::result::ExecutionResult::Halt { reason, gas }) => {
+        Ok(revm::context::result::ExecutionResult::Halt { reason, gas, .. }) => {
             println!("   🛑 Halted! Reason: {reason:?}, Gas used: {}", gas.used());
         }
         Err(e) => {
@@ -121,13 +121,13 @@ fn main() -> anyhow::Result<()> {
             println!("   📝 Value 42 written to storage");
             println!("   💰 1 wei transferred from precompile to caller as reward");
         }
-        Ok(revm::context::result::ExecutionResult::Revert { output, gas }) => {
+        Ok(revm::context::result::ExecutionResult::Revert { output, gas, .. }) => {
             println!(
                 "   ❌ Reverted! Gas used: {}, Output: {output:?}",
                 gas.used()
             );
         }
-        Ok(revm::context::result::ExecutionResult::Halt { reason, gas }) => {
+        Ok(revm::context::result::ExecutionResult::Halt { reason, gas, .. }) => {
             println!("   🛑 Halted! Reason: {reason:?}, Gas used: {}", gas.used());
         }
         Err(e) => {
@@ -161,13 +161,13 @@ fn main() -> anyhow::Result<()> {
                 println!("   ⚠️  Unexpected value in storage");
             }
         }
-        Ok(revm::context::result::ExecutionResult::Revert { output, gas }) => {
+        Ok(revm::context::result::ExecutionResult::Revert { output, gas, .. }) => {
             println!(
                 "   ❌ Reverted! Gas used: {}, Output: {output:?}",
                 gas.used()
             );
         }
-        Ok(revm::context::result::ExecutionResult::Halt { reason, gas }) => {
+        Ok(revm::context::result::ExecutionResult::Halt { reason, gas, .. }) => {
             println!("   🛑 Halted! Reason: {reason:?}, Gas used: {}", gas.used());
         }
         Err(e) => {