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/container/module/Module.java

@@ -19,6 +19,7 @@
 import java.util.List;
 
 import net.consensys.linea.zktracer.ColumnHeader;
+import net.consensys.linea.zktracer.opcode.OpCode;
 import net.consensys.linea.zktracer.types.TransactionProcessingMetadata;
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.evm.frame.MessageFrame;
@@ -50,7 +51,7 @@ default void traceContextEnter(MessageFrame frame) {}
 
   default void traceContextExit(MessageFrame frame) {}
 
-  default void tracePreOpcode(MessageFrame frame) {}
+  default void tracePreOpcode(MessageFrame frame, OpCode opcode) {}
 
   /**
    * Called when a bundle of transaction execution is cancelled; should revert the state of the

arithmetization/src/main/java/net/consensys/linea/zktracer/container/stacked/ModuleOperationStackedSet.java

@@ -20,6 +20,7 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import com.google.common.base.Preconditions;
 import lombok.Getter;
@@ -126,4 +127,8 @@ public List<E> sortOperations(Comparator<E> comparator) {
     sortedOperations.sort(comparator);
     return sortedOperations;
   }
+
+  public Stream<E> stream() {
+    return this.getAll().stream();
+  }
 }

arithmetization/src/main/java/net/consensys/linea/zktracer/module/add/Add.java

@@ -15,6 +15,9 @@
 
 package net.consensys.linea.zktracer.module.add;
 
+import static net.consensys.linea.zktracer.opcode.OpCode.ADD;
+import static net.consensys.linea.zktracer.opcode.OpCode.SUB;
+
 import java.math.BigInteger;
 import java.nio.MappedByteBuffer;
 import java.util.List;
@@ -45,12 +48,14 @@ public String moduleKey() {
   }
 
   @Override
-  public void tracePreOpcode(MessageFrame frame) {
-    operations.add(
-        new AddOperation(
-            OpCode.of(frame.getCurrentOperation().getOpcode()),
-            Bytes32.leftPad(frame.getStackItem(0)),
-            Bytes32.leftPad(frame.getStackItem(1))));
+  public void tracePreOpcode(MessageFrame frame, OpCode opcode) {
+    if ((opcode == ADD || opcode == SUB)) {
+      operations.add(
+          new AddOperation(
+              opcode,
+              Bytes32.leftPad(frame.getStackItem(0)),
+              Bytes32.leftPad(frame.getStackItem(1))));
+    }
   }
 
   @Override
@@ -68,7 +73,7 @@ public void commit(List<MappedByteBuffer> buffers) {
   }
 
   public BigInteger callADD(Bytes32 arg1, Bytes32 arg2) {
-    operations.add(new AddOperation(OpCode.ADD, arg1, arg2));
+    operations.add(new AddOperation(ADD, arg1, arg2));
     return arg1.toUnsignedBigInteger().add(arg2.toUnsignedBigInteger());
   }
 }

arithmetization/src/main/java/net/consensys/linea/zktracer/module/bin/Bin.java

@@ -15,6 +15,8 @@
 
 package net.consensys.linea.zktracer.module.bin;
 
+import static net.consensys.linea.zktracer.opcode.OpCode.*;
+
 import java.nio.MappedByteBuffer;
 import java.util.List;
 
@@ -45,14 +47,21 @@ public String moduleKey() {
   }
 
   @Override
-  public void tracePreOpcode(MessageFrame frame) {
-    final OpCode opCode = OpCode.of(frame.getCurrentOperation().getOpcode());
-    final Bytes32 arg1 = Bytes32.leftPad(frame.getStackItem(0));
-    final Bytes32 arg2 =
-        opCode == OpCode.NOT ? Bytes32.ZERO : Bytes32.leftPad(frame.getStackItem(1));
+  public void tracePreOpcode(MessageFrame frame, OpCode opcode) {
+    if (opcode == AND
+        || opcode == OR
+        || opcode == XOR
+        || opcode == NOT
+        || opcode == SIGNEXTEND
+        || opcode == BYTE) {
+
+      final Bytes32 arg1 = Bytes32.leftPad(frame.getStackItem(0));
+      final Bytes32 arg2 =
+          opcode == OpCode.NOT ? Bytes32.ZERO : Bytes32.leftPad(frame.getStackItem(1));
 
-    operations.add(
-        new BinOperation(opCode, BaseBytes.fromBytes32(arg1), BaseBytes.fromBytes32(arg2)));
+      operations.add(
+          new BinOperation(opcode, BaseBytes.fromBytes32(arg1), BaseBytes.fromBytes32(arg2)));
+    }
   }
 
   @Override

arithmetization/src/main/java/net/consensys/linea/zktracer/module/blockhash/Blockhash.java

@@ -15,8 +15,8 @@
 
 package net.consensys.linea.zktracer.module.blockhash;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static net.consensys.linea.zktracer.module.constants.GlobalConstants.LLARGE;
+import static net.consensys.linea.zktracer.opcode.OpCode.*;
 
 import java.nio.MappedByteBuffer;
 import java.util.HashMap;
@@ -76,21 +76,19 @@ public void traceStartBlock(
   }
 
   @Override
-  public void tracePreOpcode(MessageFrame frame) {
-    final OpCode opCode = OpCode.of(frame.getCurrentOperation().getOpcode());
-    checkArgument(opCode == OpCode.BLOCKHASH, "Expected BLOCKHASH opcode");
+  public void tracePreOpcode(MessageFrame frame, OpCode opcode) {
+    if (opcode == BLOCKHASH) {
 
-    blockhashArg = Bytes32.leftPad(frame.getStackItem(0));
+      blockhashArg = Bytes32.leftPad(frame.getStackItem(0));
 
-    hub.defers().scheduleForPostExecution(this);
+      hub.defers().scheduleForPostExecution(this);
+    }
   }
 
   @Override
   public void resolvePostExecution(
       Hub hub, MessageFrame frame, Operation.OperationResult operationResult) {
 
-    final OpCode opCode = OpCode.of(frame.getCurrentOperation().getOpcode());
-    checkArgument(opCode == OpCode.BLOCKHASH);
     final Bytes32 blockhashRes = Bytes32.leftPad(frame.getStackItem(0));
     operations.add(new BlockhashOperation(relBlock, absBlock, blockhashArg, blockhashRes, wcp));
     // We have 4 LLARGE and one OLI call to WCP, made at the end of the conflation, so we need to

arithmetization/src/main/java/net/consensys/linea/zktracer/module/ext/Ext.java

@@ -15,6 +15,8 @@
 
 package net.consensys.linea.zktracer.module.ext;
 
+import static net.consensys.linea.zktracer.opcode.OpCode.*;
+
 import java.nio.MappedByteBuffer;
 import java.util.List;
 
@@ -26,7 +28,6 @@
 import net.consensys.linea.zktracer.container.stacked.ModuleOperationStackedSet;
 import net.consensys.linea.zktracer.module.hub.Hub;
 import net.consensys.linea.zktracer.opcode.OpCode;
-import net.consensys.linea.zktracer.opcode.OpCodeData;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.hyperledger.besu.evm.frame.MessageFrame;
@@ -46,14 +47,15 @@ public String moduleKey() {
   }
 
   @Override
-  public void tracePreOpcode(final MessageFrame frame) {
-    final OpCodeData opCode = hub.opCodeData();
-    operations.add(
-        new ExtOperation(
-            opCode.mnemonic(),
-            Bytes32.leftPad(frame.getStackItem(0)),
-            Bytes32.leftPad(frame.getStackItem(1)),
-            Bytes32.leftPad(frame.getStackItem(2))));
+  public void tracePreOpcode(MessageFrame frame, OpCode opcode) {
+    if (opcode == ADDMOD || opcode == MULMOD) {
+      operations.add(
+          new ExtOperation(
+              opcode,
+              Bytes32.leftPad(frame.getStackItem(0)),
+              Bytes32.leftPad(frame.getStackItem(1)),
+              Bytes32.leftPad(frame.getStackItem(2))));
+    }
   }
 
   public Bytes call(OpCode opCode, Bytes _arg1, Bytes _arg2, Bytes _arg3) {

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());
   }
@@ -848,33 +844,6 @@ private void handleStack(MessageFrame frame) {
         .processInstruction(this, frame, MULTIPLIER___STACK_STAMP * (stamp() + 1));
   }
 
-  void triggerModules(MessageFrame frame) {
-    if (pch.signals().add()) {
-      add.tracePreOpcode(frame);
-    }
-    if (pch.signals().bin()) {
-      bin.tracePreOpcode(frame);
-    }
-    if (pch.signals().mul()) {
-      mul.tracePreOpcode(frame);
-    }
-    if (pch.signals().ext()) {
-      ext.tracePreOpcode(frame);
-    }
-    if (pch.signals().mod()) {
-      mod.tracePreOpcode(frame);
-    }
-    if (pch.signals().wcp()) {
-      wcp.tracePreOpcode(frame);
-    }
-    if (pch.signals().shf()) {
-      shf.tracePreOpcode(frame);
-    }
-    if (pch.signals().blockhash()) {
-      blockhash.tracePreOpcode(frame);
-    }
-  }
-
   public int stamp() {
     return state.stamps().hub();
   }
@@ -914,9 +883,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();
         }
@@ -934,9 +902,16 @@ void processStateExec(MessageFrame frame) {
     pch.setup(frame);
 
     this.handleStack(frame);
-    this.triggerModules(frame);
+
+    // Trigger basic operations modules
+    if (Exceptions.none(pch.exceptions())) {
+      for (Module m : modules) {
+        m.tracePreOpcode(frame, opCode());
+      }
+    }
 
     if (currentFrame().stack().isOk()) {
+      // Tracer for the HUB
       this.traceOpcode(frame);
     } else {
       this.squashCurrentFrameOutputData();
@@ -949,10 +924,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) {