clean: some cleaning

.github/actions/setup-go-corset/action.yml

@@ -12,4 +12,4 @@ runs:
 
     - name: Install Go Corset
       shell: bash
-      run: go install github.com/consensys/go-corset/cmd/go-corset@a899fbd
+      run: go install github.com/consensys/go-corset/cmd/go-corset@4e884ec

arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/AccountSnapshot.java

@@ -46,9 +46,6 @@ public class AccountSnapshot {
   private int deploymentNumber;
   private boolean deploymentStatus;
 
-  // TODO: is there a "canonical" way to take a snapshot fo an account
-  //  where getWorldUpdater().get(address) return null ?
-
   /**
    * Canonical way of creating an account snapshot.
    *
@@ -241,9 +238,9 @@ public AccountSnapshot setDeploymentNumber(DeploymentInfo deploymentInfo) {
     return this.deploymentNumber(deploymentInfo.deploymentNumber(address));
   }
 
-  public AccountSnapshot decrementDeploymentNumberByOne() {
+  public void decrementDeploymentNumberByOne() {
     checkState(deploymentNumber > 0);
-    return this.deploymentNumber(deploymentNumber - 1);
+    this.deploymentNumber(deploymentNumber - 1);
   }
 
   public AccountSnapshot setDeploymentInfo(Hub hub) {
@@ -261,9 +258,4 @@ public AccountSnapshot deployByteCode(Bytecode code) {
 
     return new AccountSnapshot(address, nonce, balance, true, code, deploymentNumber, false);
   }
-
-  public AccountSnapshot copyDeploymentInfoFrom(AccountSnapshot snapshot) {
-    return this.deploymentNumber(snapshot.deploymentNumber)
-        .deploymentStatus(snapshot.deploymentStatus);
-  }
 }

arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java

@@ -647,8 +647,6 @@ public void traceContextEnter(MessageFrame frame) {
 
   @Override
   public void traceContextExit(MessageFrame frame) {
-    this.currentFrame().initializeFrame(frame); // TODO: is it needed ?
-
     exitDeploymentFromDeploymentInfoPov(frame);
 
     // We take a snapshot before exiting the transaction
@@ -672,7 +670,6 @@ public void traceContextExit(MessageFrame frame) {
     }
 
     defers.resolveUponContextExit(this, this.currentFrame());
-    // TODO: verify me please @Olivier
     if (this.currentFrame().opCode() == REVERT || Exceptions.any(pch.exceptions())) {
       defers.resolveUponRollback(this, frame, this.currentFrame());
     }
@@ -685,7 +682,6 @@ public void traceContextExit(MessageFrame frame) {
   public void traceContextReEnter(MessageFrame frame) {
     // Note: the update of the currentId call frame is made during traceContextExit of the child
     // frame
-    this.currentFrame().initializeFrame(frame); // TODO: is it needed ?
     defers.resolveUponContextReEntry(this, this.currentFrame());
     this.unlatchStack(frame, this.currentFrame().childSpanningSection());
   }
@@ -914,9 +910,8 @@ public void unlatchStack(MessageFrame frame, TraceSection section) {
 
       if (line.needsResult()) {
         Bytes result = Bytes.EMPTY;
-        // Only pop from the stack if no exceptions have been encountered
-        // TODO: when we call this from contextReenter, pch.exceptions is not the one from the
-        // caller/creater ?
+        // Note: when we call this from contextReenter, pch.exceptions is the one from the last
+        // opcode of the caller/creater ?
         if (Exceptions.none(pch.exceptions())) {
           result = frame.getStackItem(0).copy();
         }
@@ -949,10 +944,6 @@ void processStateExec(MessageFrame frame) {
     }
   }
 
-  // TODO: how do these implementations of remainingGas()
-  //  and expectedGas() behave with respect to resuming
-  //  execution after a CALL / CREATE ? One of them is
-  //  necessarily false ...
   public long remainingGas() {
     return this.state().processingPhase() == TX_EXEC
         ? this.currentFrame().frame().getRemainingGas()

arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/fragment/StackFragment.java

@@ -35,7 +35,6 @@
 import net.consensys.linea.zktracer.module.hub.signals.AbortingConditions;
 import net.consensys.linea.zktracer.module.hub.signals.Exceptions;
 import net.consensys.linea.zktracer.module.hub.signals.TracedException;
-import net.consensys.linea.zktracer.module.hub.state.State;
 import net.consensys.linea.zktracer.opcode.InstructionFamily;
 import net.consensys.linea.zktracer.opcode.OpCode;
 import net.consensys.linea.zktracer.opcode.gas.MxpType;
@@ -60,8 +59,6 @@ public final class StackFragment implements TraceFragment {
   @Getter private final OpCode opCode;
   @Getter private final int rawOpCode;
   @Setter private boolean jumpDestinationVettingRequired;
-  @Setter private boolean validJumpDestination;
-  private final State.HubTransactionState.Stamps stamps;
   private final CommonFragmentValues commonFragmentValues;
   private final EWord pushValue;
 
@@ -139,7 +136,6 @@ private StackFragment(
       jumpDestinationVettingRequired = false;
     }
 
-    this.stamps = hub.state().stamps();
     this.commonFragmentValues = commonFragmentValues;
     this.pushValue = opCode.isPush() ? EWord.of(getPushValue(hub)) : EWord.ZERO;
   }
@@ -278,7 +274,7 @@ public Trace trace(Trace trace) {
         .pStackStaticFlag(stack.getCurrentOpcodeData().stackSettings().forbiddenInStatic())
         .pStackPushValueHi(pushValue.hi())
         .pStackPushValueLo(pushValue.lo())
-        .pStackJumpDestinationVettingRequired(jumpDestinationVettingRequired) // TODO: confirm this
+        .pStackJumpDestinationVettingRequired(jumpDestinationVettingRequired)
         // Exception flag
         .pStackOpcx(tracedException == INVALID_OPCODE)
         .pStackSux(tracedException == STACK_UNDERFLOW)
@@ -295,8 +291,7 @@ public Trace trace(Trace trace) {
         .pStackHashInfoFlag(hashInfoFlag)
         .pStackHashInfoKeccakHi(hashInfoKeccak.hi())
         .pStackHashInfoKeccakLo(hashInfoKeccak.lo())
-        .pStackLogInfoFlag(this.traceLog()) // TODO: confirm this
-    ;
+        .pStackLogInfoFlag(traceLog());
   }
 
   private void tracedExceptionSanityChecks(TracedException tracedException) {

arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/fragment/account/AccountFragment.java

@@ -50,8 +50,6 @@ public final class AccountFragment
 
   @Getter private final AccountSnapshot oldState;
   @Getter private final AccountSnapshot newState;
-  @Setter private int deploymentNumberInfinity = 0; // retconned on conflation end
-  @Setter private boolean existsInfinity = false; // retconned on conflation end
   @Setter private boolean requiresRomlex;
   private int codeFragmentIndex;
   private final Optional<Bytes> addressToTrim;
@@ -157,8 +155,6 @@ public Trace trace(Trace trace) {
         .pAccountDeploymentStatus(oldState.deploymentStatus())
         .pAccountDeploymentNumberNew(newState.deploymentNumber())
         .pAccountDeploymentStatusNew(newState.deploymentStatus())
-        .pAccountDeploymentNumberInfty(deploymentNumberInfinity)
-        .pAccountDeploymentStatusInfty(existsInfinity)
         .pAccountTrmFlag(addressToTrim.isPresent())
         .pAccountTrmRawAddressHi(addressToTrim.map(a -> EWord.of(a).hi()).orElse(Bytes.EMPTY))
         .pAccountIsPrecompile(isPrecompile(oldState.address()));
@@ -184,8 +180,8 @@ public void resolveAtEndTransaction(
 
   @Override
   public void resolvePostConflation(Hub hub, WorldView world) {
-    deploymentNumberInfinity = hub.deploymentNumberOf(newState.address());
-    existsInfinity = world.get(newState.address()) != null;
+    // Note: we DO need the CFI, even if we don't have the romlex flag on, for CFI consistency
+    // argument.
     try {
       codeFragmentIndex =
           hub.getCodeFragmentIndexByMetaData(

arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/fragment/account/RlpAddrSubFragment.java

@@ -45,8 +45,7 @@ public static RlpAddrSubFragment makeFragment(Hub hub, Address deploymentAddress
         final MessageFrame frame = hub.currentFrame().frame();
         final Bytes32 salt = Bytes32.leftPad(frame.getStackItem(3));
         final Bytes initCode = OperationAncillaries.initCode(frame);
-        final Bytes32 hash =
-            Hash.keccak256(initCode); // TODO: could be done better, we compute the HASH two times
+        final Bytes32 hash = Hash.keccak256(initCode);
         hub.rlpAddr().callRlpAddrCreate2(frame, salt, hash);
         return new RlpAddrSubFragment((short) 2, deploymentAddress, salt, hash);
       }

arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/fragment/common/CommonFragment.java

@@ -18,31 +18,14 @@
 import static net.consensys.linea.zktracer.module.hub.HubProcessingPhase.*;
 import static net.consensys.linea.zktracer.module.hub.HubProcessingPhase.TX_EXEC;
 
-import java.util.function.Supplier;
-
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.Accessors;
-import net.consensys.linea.zktracer.ZkTracer;
-import net.consensys.linea.zktracer.module.hub.Hub;
 import net.consensys.linea.zktracer.module.hub.Trace;
 import net.consensys.linea.zktracer.module.hub.fragment.TraceFragment;
 import net.consensys.linea.zktracer.module.hub.signals.Exceptions;
-import net.consensys.linea.zktracer.module.hub.signals.TracedException;
 import net.consensys.linea.zktracer.runtime.callstack.CallFrame;
-import net.consensys.linea.zktracer.types.EWord;
 import net.consensys.linea.zktracer.types.TransactionProcessingMetadata;
 import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-import org.hyperledger.besu.datatypes.Address;
-import org.hyperledger.besu.datatypes.Wei;
-import org.hyperledger.besu.evm.EVM;
-import org.hyperledger.besu.evm.EvmSpecVersion;
-import org.hyperledger.besu.evm.internal.EvmConfiguration;
-import org.hyperledger.besu.evm.operation.Operation;
-import org.hyperledger.besu.evm.operation.OperationRegistry;
-import org.hyperledger.besu.evm.operation.SelfDestructOperation;
-import org.hyperledger.besu.evm.worldstate.WorldView;
 
 @Accessors(fluent = true, chain = false)
 @RequiredArgsConstructor
@@ -71,17 +54,10 @@ private boolean isUnexceptional() {
     return Exceptions.none(commonFragmentValues.exceptions);
   }
 
-  public boolean txReverts() {
-    return commonFragmentValues.txMetadata.statusCode();
-  }
-
   public Trace trace(Trace trace) {
     final CallFrame frame = commonFragmentValues.callFrame;
     final TransactionProcessingMetadata tx = commonFragmentValues.txMetadata;
     final boolean isExec = commonFragmentValues.hubProcessingPhase == TX_EXEC;
-    final boolean oogx =
-        commonFragmentValues.tracedException() == TracedException.OUT_OF_GAS_EXCEPTION;
-    final boolean nonOogException = Exceptions.any(commonFragmentValues.exceptions) && !oogx;
     return trace
         .absoluteTransactionNumber(tx.getAbsoluteTransactionNumber())
         .relativeBlockNumber(tx.getRelativeBlockNumber())
@@ -117,111 +93,11 @@ public Trace trace(Trace trace) {
         .gasCost(Bytes.ofUnsignedLong(commonFragmentValues.gasCostToTrace()))
         .gasNext(
             Bytes.ofUnsignedLong(isExec && isUnexceptional() ? commonFragmentValues.gasNext : 0))
-        .refundCounter(
-            (commonFragmentValues.hubProcessingPhase == TX_EXEC)
-                ? commonFragmentValues.gasRefund
-                : 0)
-        .refundCounterNew(
-            (commonFragmentValues.hubProcessingPhase == TX_EXEC)
-                ? commonFragmentValues.gasRefundNew
-                : 0)
+        .refundCounter(isExec ? commonFragmentValues.gasRefund : 0)
+        .refundCounterNew(isExec ? commonFragmentValues.gasRefundNew : 0)
         .twoLineInstruction(commonFragmentValues.TLI)
         .counterTli(twoLineInstructionCounter)
         .nonStackRows((short) commonFragmentValues.numberOfNonStackRows)
         .counterNsr((short) nonStackRowsCounter);
   }
-
-  static long computeGasCost(Hub hub, WorldView world) {
-
-    switch (hub.opCodeData().instructionFamily()) {
-      case ADD, MOD, SHF, BIN, WCP, EXT, BATCH, MACHINE_STATE, PUSH_POP, DUP, SWAP, INVALID -> {
-        if (Exceptions.outOfGasException(hub.pch().exceptions())
-            || Exceptions.none(hub.pch().exceptions())) {
-          return hub.opCode().getData().stackSettings().staticGas().cost();
-        }
-        return 0;
-      }
-      case STORAGE -> {
-        switch (hub.opCode()) {
-          case SSTORE -> {
-            return gasCostSstore(hub, world);
-          }
-          case SLOAD -> {
-            return gasCostSload(hub, world);
-          }
-          default -> throw new RuntimeException(
-              "Gas cost not covered for " + hub.opCode().toString());
-        }
-      }
-      case HALT -> {
-        switch (hub.opCode()) {
-          case STOP -> {
-            return 0;
-          }
-          case RETURN, REVERT -> {
-            Bytes offset = hub.messageFrame().getStackItem(0);
-            Bytes size = hub.messageFrame().getStackItem(0);
-            return Exceptions.memoryExpansionException(hub.pch().exceptions())
-                ? 0
-                : ZkTracer.gasCalculator.memoryExpansionGasCost(
-                    hub.messageFrame(), offset.toLong(), size.toLong());
-          }
-          case SELFDESTRUCT -> {
-            SelfDestructOperation op = new SelfDestructOperation(ZkTracer.gasCalculator);
-            Operation.OperationResult operationResult =
-                op.execute(
-                    hub.messageFrame(),
-                    new EVM(
-                        new OperationRegistry(),
-                        ZkTracer.gasCalculator,
-                        EvmConfiguration.DEFAULT,
-                        EvmSpecVersion.LONDON));
-            long gasCost = operationResult.getGasCost();
-            Address recipient = Address.extract((Bytes32) hub.messageFrame().getStackItem(0));
-            Wei inheritance = world.get(hub.messageFrame().getRecipientAddress()).getBalance();
-            return ZkTracer.gasCalculator.selfDestructOperationGasCost(
-                world.get(recipient), inheritance);
-          }
-        }
-        return 0;
-      }
-      default -> {
-        throw new RuntimeException("Gas cost not covered for " + hub.opCode().toString());
-      }
-    }
-  }
-
-  static long gasCostSstore(Hub hub, WorldView world) {
-
-    final Address address = hub.currentFrame().accountAddress();
-    final Bytes32 storageKey = EWord.of(hub.messageFrame().getStackItem(0));
-
-    final UInt256 storageKeyUint256 = UInt256.fromBytes(hub.messageFrame().getStackItem(0));
-    final UInt256 valueNextUint256 = UInt256.fromBytes(hub.messageFrame().getStackItem(1));
-
-    final Supplier<UInt256> valueCurrentSupplier =
-        () -> world.get(address).getStorageValue(storageKeyUint256);
-    final Supplier<UInt256> valueOriginalSupplier =
-        () -> world.get(address).getOriginalStorageValue(storageKeyUint256);
-
-    final long storageCost =
-        ZkTracer.gasCalculator.calculateStorageCost(
-            valueNextUint256, valueCurrentSupplier, valueOriginalSupplier);
-    final boolean storageSlotWarmth =
-        hub.currentFrame().frame().getWarmedUpStorage().contains(address, storageKey);
-
-    return storageCost + (storageSlotWarmth ? 0L : ZkTracer.gasCalculator.getColdSloadCost());
-  }
-
-  static long gasCostSload(Hub hub, WorldView world) {
-    final Address address = hub.currentFrame().accountAddress();
-    final Bytes32 storageKey = EWord.of(hub.messageFrame().getStackItem(0));
-    final boolean storageSlotWarmth =
-        hub.currentFrame().frame().getWarmedUpStorage().contains(address, storageKey);
-
-    return ZkTracer.gasCalculator.getSloadOperationGasCost()
-        + (storageSlotWarmth
-            ? ZkTracer.gasCalculator.getWarmStorageReadCost()
-            : ZkTracer.gasCalculator.getColdSloadCost());
-  }
 }

arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/fragment/common/CommonFragmentValues.java

@@ -91,9 +91,8 @@ public CommonFragmentValues(Hub hub) {
     this.height = callFrame.stack().getHeight();
     this.heightNew = callFrame.stack().getHeightNew();
 
-    // TODO: partial solution, will not work in general
-    this.gasExpected = isExec ? computeGasExpected() : 0;
-    this.gasActual = isExec ? computeGasRemaining() : 0;
+    this.gasExpected = computeGasExpected();
+    this.gasActual = computeGasRemaining();
     this.gasCost = isExec ? computeGasCost() : 0;
     this.gasNext = isExec ? computeGasNext(exceptions) : 0;
     this.gasCostExcluduingDeploymentCost = isExec ? computeGasCostExcludingDeploymentCost() : 0;
@@ -210,11 +209,10 @@ public long computeGasRemaining() {
   }
 
   public long computeGasExpected() {
+    if (hub.state().processingPhase() != TX_EXEC) return 0;
 
     final CallFrame currentFrame = hub.currentFrame();
 
-    if (hub.state().processingPhase() != TX_EXEC) return 0;
-
     if (currentFrame.executionPaused()) {
       currentFrame.unpauseCurrentFrame();
       return currentFrame.lastValidGasNext();
@@ -260,19 +258,19 @@ public long computeGasNext(short exceptions) {
     return switch (hub.opCodeData().instructionFamily()) {
       case KEC, COPY, STACK_RAM, STORAGE, LOG, HALT -> gasAfterDeductingCost;
       case CREATE -> gasAfterDeductingCost;
-        // TODO: this is only part of the story because of
+        // Note: this is only part of the story because of
         //  1. nonempty init code CREATE's where gas is paid out of pocket
+        // This is done in the CREATE section
       case CALL -> gasAfterDeductingCost;
-        // TODO: this is only part of the story because of
+        // Note: this is only part of the story because of
         //  1. aborts with value transfers (immediately reapStipend)
         //  2. EOA calls with value transfer (immediately reapStipend)
         //  3. SMC calls: gas paid out of pocket
         //  4. PRC calls: gas paid out of pocket + special PRC cost + returned gas
+        // This is done in the CALL section
 
       default -> // ADD, MUL, MOD, EXT, WCP, BIN, SHF, CONTEXT, ACCOUNT, TRANSACTION, BATCH, JUMP,
       // MACHINE_STATE, PUSH_POP, DUP, SWAP, INVALID
-      // TODO: this may not work for EXP, EXTCODEHASH, EXTCODESIZE, BALANCE as they require extra
-      //  care for pricing because of ⒈ warmth and ⒉ log computations
       gasAfterDeductingCost;
     };
   }
@@ -298,8 +296,6 @@ public long gasCostToTrace() {
       return 0;
     }
 
-    // TODO @Olivier: special care for CALL's and CREATE's
-
     return gasCost;
   }
 }

arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/fragment/imc/StpCall.java

@@ -154,7 +154,7 @@ public long effectiveChildContextGasAllowance() {
   public Trace trace(Trace trace) {
     return trace
         .pMiscStpFlag(true)
-        .pMiscStpInstruction(opCode.byteValue() & 0xff)
+        .pMiscStpInstruction(opCode.unsignedByteValue())
         .pMiscStpGasHi(gas.hi())
         .pMiscStpGasLo(gas.lo())
         .pMiscStpValueHi(value.hi())