Skip to content

Commit

Permalink
fix rebase
Browse files Browse the repository at this point in the history
Signed-off-by: F Bojarski <[email protected]>
  • Loading branch information
letypequividelespoubelles committed Feb 7, 2025
1 parent a534435 commit c05307e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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);
Expand All @@ -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)) {
Expand All @@ -781,6 +778,8 @@ private void compareLineaAndBesuGasCosts(
long lineaGasCostExcludingDeploymentCost =
currentSection.commonValues.gasCostExcluduingDeploymentCost();

gasCostAccumulator += besuGasCost;

if (operationResult.getHaltReason() != null) {

return;
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit c05307e

Please sign in to comment.