Skip to content

Commit

Permalink
Merge branch '1727-feat-enable-popping-transaction-bundles' of github…
Browse files Browse the repository at this point in the history
….com:Consensys/linea-tracer into 1727-feat-enable-popping-transaction-bundles
  • Loading branch information
letypequividelespoubelles committed Feb 7, 2025
2 parents a7a438c + 09f93b0 commit 36eb50a
Showing 1 changed file with 6 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -537,9 +537,9 @@ public void traceEndTransaction(

// TODO: add the following resolution this.defers.resolvePostRollback(this, ...

txStack.current().completeLineaTransaction(this, world, isSuccessful, logs, selfDestructs);
txStack.current().completeLineaTransaction(this, isSuccessful, logs, selfDestructs);

defers.resolveAtEndTransaction(this, world, tx, isSuccessful);
defers.resolveAfterTransactionFinalization(this, world);

// Warn: we need to call MMIO after resolving the defers
for (Module m : modules) {
Expand Down Expand Up @@ -736,6 +736,8 @@ 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 @@ -746,10 +748,7 @@ public void tracePostExecution(MessageFrame frame, Operation.OperationResult ope

if (frame.getDepth() == 0 && (isExceptional() || opCode().isHalt())) {
state.processingPhase(TX_FINL);
coinbaseWarmthAtTransactionEnd =
isExceptional() || opCode() == REVERT
? txStack.current().coinbaseWarmthAfterTxInit(this)
: frame.isAddressWarm(coinbaseAddress);
coinbaseWarmthAtTransactionEnd = frame.isAddressWarm(coinbaseAddress);
}

if (frame.getDepth() == 0 && (isExceptional() || opCode() == REVERT)) {
Expand All @@ -775,8 +774,6 @@ private void compareLineaAndBesuGasCosts(
long lineaGasCostExcludingDeploymentCost =
currentSection.commonValues.gasCostExcluduingDeploymentCost();

gasCostAccumulator += besuGasCost;

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

return;
Expand Down Expand Up @@ -870,7 +867,7 @@ private void exitDeploymentFromDeploymentInfoPov(MessageFrame frame) {
transients.conflation().deploymentInfo().markAsNotUnderDeployment(bytecodeAddress);
}

public int getCodeFragmentIndexByMetaData(
public int getCfiByMetaData(
final Address address, final int deploymentNumber, final boolean deploymentStatus) {
return this.romLex()
.getCodeFragmentIndexByMetadata(
Expand Down

0 comments on commit 36eb50a

Please sign in to comment.