From c05307ec58fd3b853acc92dfd402f7c327d55e77 Mon Sep 17 00:00:00 2001
From: F Bojarski <ceciestunepoubelle@protonmail.ch>
Date: Fri, 7 Feb 2025 12:00:22 +0100
Subject: [PATCH] fix rebase

Signed-off-by: F Bojarski <ceciestunepoubelle@protonmail.ch>
---
 .../consensys/linea/zktracer/module/hub/Hub.java  | 15 +++++++--------
 linea-constraints                                 |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java
index ed40c788c..2f3ca7cb2 100644
--- a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java
+++ b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java
@@ -680,10 +680,6 @@ public void traceContextExit(MessageFrame frame) {
       if (state.processingPhase() != TX_SKIP
           && frame.getState() == MessageFrame.State.COMPLETED_SUCCESS) {
         state.processingPhase(TX_FINL);
-        coinbaseWarmthAtTransactionEnd =
-            isExceptional() || opCode() == REVERT
-                ? txStack.current().coinbaseWarmthAfterTxInit(this)
-                : frame.isAddressWarm(coinbaseAddress);
         new TxFinalizationSection(this, frame.getWorldUpdater(), false);
       }
     }
@@ -743,8 +739,6 @@ public void tracePostExecution(MessageFrame frame, Operation.OperationResult ope
     if (isExceptional()) {
       this.currentTraceSection()
           .exceptionalContextFragment(ContextFragment.executionProvidesEmptyReturnData(this));
-      this.squashCurrentFrameOutputData();
-      this.squashParentFrameReturnData();
     }
 
     defers.resolvePostExecution(this, frame, operationResult);
@@ -755,7 +749,10 @@ public void tracePostExecution(MessageFrame frame, Operation.OperationResult ope
 
     if (frame.getDepth() == 0 && (isExceptional() || opCode().isHalt())) {
       state.processingPhase(TX_FINL);
-      coinbaseWarmthAtTransactionEnd = frame.isAddressWarm(coinbaseAddress);
+      coinbaseWarmthAtTransactionEnd =
+          isExceptional() || opCode() == REVERT
+              ? txStack.current().coinbaseWarmthAfterTxInit(this)
+              : frame.isAddressWarm(coinbaseAddress);
     }
 
     if (frame.getDepth() == 0 && (isExceptional() || opCode() == REVERT)) {
@@ -781,6 +778,8 @@ private void compareLineaAndBesuGasCosts(
     long lineaGasCostExcludingDeploymentCost =
         currentSection.commonValues.gasCostExcluduingDeploymentCost();
 
+    gasCostAccumulator += besuGasCost;
+
     if (operationResult.getHaltReason() != null) {
 
       return;
@@ -1110,7 +1109,7 @@ public void squashCurrentFrameOutputData() {
   }
 
   public void squashParentFrameReturnData() {
-    callStack.parentCallFrame().outputDataRange(MemoryRange.EMPTY);
+    callStack.parentCallFrame().returnDataRange(MemoryRange.EMPTY);
   }
 
   public CallFrame getLastChildCallFrame(final CallFrame parentFrame) {
diff --git a/linea-constraints b/linea-constraints
index be40337bd..c2bf8fa16 160000
--- a/linea-constraints
+++ b/linea-constraints
@@ -1 +1 @@
-Subproject commit be40337bda0a65f271f2ed9260c29271c637cfdb
+Subproject commit c2bf8fa169453319b753a8f1b4c06ef3ce30ba01