From b99cdf627378ad4da646c105b24025ba0006e9c4 Mon Sep 17 00:00:00 2001
From: Luis Pinto <luis.pinto@consensys.net>
Date: Wed, 14 Aug 2024 16:54:13 +0000
Subject: [PATCH] Precompile calls were not traced when insuficient gas (#7462)

* Precompile calls were not traced when insuficient gas

Signed-off-by: Luis Pinto <luis.pinto@consensys.net>

* fixup! Precompile calls were not traced when insuficient gas

 revert RuntimeException in StateDiffGenerator

Signed-off-by: Luis Pinto <luis.pinto@consensys.net>

---------

Signed-off-by: Luis Pinto <luis.pinto@consensys.net>
---
 CHANGELOG.md                                  |  1 +
 .../evm/processor/MessageCallProcessor.java   |  1 +
 .../processor/MessageCallProcessorTest.java   | 66 +++++++++++++++++++
 3 files changed, 68 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d30381a92..8a16284015 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - Correct entrypoint in Docker evmtool [#7430](https://github.com/hyperledger/besu/pull/7430)
 - Fix protocol schedule check for devnets [#7429](https://github.com/hyperledger/besu/pull/7429)
 - Fix behaviour when starting in a pre-merge network [#7431](https://github.com/hyperledger/besu/pull/7431)
+- Fix tracing in precompiled contracts when halting for out of gas [#7318](https://github.com/hyperledger/besu/issues/7318)
 
 ## 24.7.1
 
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/processor/MessageCallProcessor.java b/evm/src/main/java/org/hyperledger/besu/evm/processor/MessageCallProcessor.java
index 1963bba8a5..e3ce69d74a 100644
--- a/evm/src/main/java/org/hyperledger/besu/evm/processor/MessageCallProcessor.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/processor/MessageCallProcessor.java
@@ -153,6 +153,7 @@ public class MessageCallProcessor extends AbstractMessageProcessor {
     if (frame.getRemainingGas() < gasRequirement) {
       frame.setExceptionalHaltReason(Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
       frame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
+      operationTracer.tracePrecompileCall(frame, gasRequirement, null);
     } else {
       frame.decrementRemainingGas(gasRequirement);
       final PrecompiledContract.PrecompileContractResult result =
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/processor/MessageCallProcessorTest.java b/evm/src/test/java/org/hyperledger/besu/evm/processor/MessageCallProcessorTest.java
index c3f04c07c5..d17744c858 100644
--- a/evm/src/test/java/org/hyperledger/besu/evm/processor/MessageCallProcessorTest.java
+++ b/evm/src/test/java/org/hyperledger/besu/evm/processor/MessageCallProcessorTest.java
@@ -14,10 +14,23 @@
  */
 package org.hyperledger.besu.evm.processor;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
 import org.hyperledger.besu.evm.precompile.PrecompileContractRegistry;
+import org.hyperledger.besu.evm.precompile.PrecompiledContract;
+import org.hyperledger.besu.evm.testutils.TestMessageFrameBuilder;
+import org.hyperledger.besu.evm.toy.ToyWorld;
 
 import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -28,9 +41,62 @@ class MessageCallProcessorTest extends AbstractMessageProcessorTest<MessageCallP
 
   @Mock EVM evm;
   @Mock PrecompileContractRegistry precompileContractRegistry;
+  @Mock PrecompiledContract contract;
 
   @Override
   protected MessageCallProcessor getAbstractMessageProcessor() {
     return new MessageCallProcessor(evm, precompileContractRegistry);
   }
+
+  @Test
+  public void shouldTracePrecompileContractCall() {
+    Address sender = Address.ZERO;
+    Address recipient = Address.fromHexString("0x1");
+
+    ToyWorld toyWorld = new ToyWorld();
+    toyWorld.createAccount(sender);
+    toyWorld.createAccount(recipient);
+
+    final MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .worldUpdater(toyWorld)
+            .sender(sender)
+            .address(recipient)
+            .initialGas(20L)
+            .build();
+
+    when(precompileContractRegistry.get(any())).thenReturn(contract);
+    when(contract.gasRequirement(any())).thenReturn(10L);
+    when(contract.computePrecompile(any(), eq(messageFrame)))
+        .thenReturn(PrecompiledContract.PrecompileContractResult.success(any()));
+
+    getAbstractMessageProcessor().process(messageFrame, operationTracer);
+
+    verify(operationTracer, times(1)).tracePrecompileCall(eq(messageFrame), anyLong(), any());
+  }
+
+  @Test
+  public void shouldTracePrecompileContractCallOutOfGas() {
+    Address sender = Address.ZERO;
+    Address recipient = Address.fromHexString("0x1");
+
+    ToyWorld toyWorld = new ToyWorld();
+    toyWorld.createAccount(sender);
+    toyWorld.createAccount(recipient);
+
+    final MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .worldUpdater(toyWorld)
+            .sender(sender)
+            .address(recipient)
+            .initialGas(5L)
+            .build();
+
+    when(precompileContractRegistry.get(any())).thenReturn(contract);
+    when(contract.gasRequirement(any())).thenReturn(10L);
+
+    getAbstractMessageProcessor().process(messageFrame, operationTracer);
+
+    verify(operationTracer, times(1)).tracePrecompileCall(eq(messageFrame), anyLong(), any());
+  }
 }