EIP-3855-PUSH0 (#1965)

Signed-off-by: F Bojarski <[email protected]>

Author: letypequividelespoubelles

arithmetization/src/main/java/net/consensys/linea/zktracer/Fork.java

@@ -20,4 +20,13 @@ public enum Fork {
   SHANGHAI,
   CANCUN,
   PRAGUE;
+
+  public static String toString(Fork fork) {
+    return switch (fork) {
+      case LONDON -> "london";
+      case SHANGHAI -> "shanghai";
+      case CANCUN -> "cancun";
+      case PRAGUE -> "prague";
+    };
+  }
 }

arithmetization/src/main/java/net/consensys/linea/zktracer/ZkTracer.java

@@ -15,6 +15,7 @@
 package net.consensys.linea.zktracer;
 
 import static net.consensys.linea.zktracer.ChainConfig.FORK_LINEA_CHAIN;
+import static net.consensys.linea.zktracer.opcode.OpCodes.loadOpcodes;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
@@ -82,6 +83,7 @@ public ZkTracer(
    * @param chain
    */
   public ZkTracer(ChainConfig chain) {
+    loadOpcodes(chain.fork);
     this.chain = chain;
     this.hub =
         switch (chain.fork) {

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

@@ -17,6 +17,7 @@
 
 import static com.google.common.base.Preconditions.*;
 import static com.google.common.primitives.Ints.min;
+import static net.consensys.linea.zktracer.Trace.EVM_INST_PUSH0;
 import static net.consensys.linea.zktracer.module.hub.signals.TracedException.*;
 import static net.consensys.linea.zktracer.opcode.InstructionFamily.*;
 import static net.consensys.linea.zktracer.types.Utils.rightPadTo;
@@ -137,21 +138,21 @@ private StackFragment(
     }
 
     this.commonFragmentValues = commonFragmentValues;
-    this.pushValue = opCode.isPush() ? EWord.of(getPushValue(hub)) : EWord.ZERO;
+    this.pushValue = opCode.isNonTrivialPush() ? EWord.of(getPushValue(hub)) : EWord.ZERO;
   }
 
   private Bytes getPushValue(Hub hub) {
-    checkState(hub.opCode().isPush());
+    checkState(hub.opCode().isNonTrivialPush());
 
     final int pc = hub.messageFrame().getPC();
     if (pc + 1 >= hub.messageFrame().getCode().getSize()) {
       return Bytes.EMPTY;
     }
 
-    Bytes byteCode = hub.messageFrame().getCode().getBytes();
-    int nBytesToPush = (opCode.byteValue() & 0xff) - (OpCode.PUSH1.byteValue() & 0xff) + 1;
-    int nLeftoverBytes = byteCode.size() - (pc + 1);
-    Bytes partialPushValue = byteCode.slice(pc + 1, min(nLeftoverBytes, nBytesToPush));
+    final Bytes byteCode = hub.messageFrame().getCode().getBytes();
+    final int nBytesToPush = (opCode.byteValue() & 0xff) - EVM_INST_PUSH0;
+    final int nLeftoverBytes = byteCode.size() - (pc + 1);
+    final Bytes partialPushValue = byteCode.slice(pc + 1, min(nLeftoverBytes, nBytesToPush));
     return (nLeftoverBytes >= nBytesToPush)
         ? partialPushValue
         : rightPadTo(partialPushValue, nBytesToPush);
@@ -216,7 +217,8 @@ public Trace.Hub trace(Trace.Hub trace) {
     while (it.hasNext()) {
       var i = it.nextIndex();
       var op = it.next();
-      final EWord eValue = (i == 3 && opCode().isPush()) ? pushValue : EWord.of(op.value());
+      final EWord eValue =
+          (i == 3 && opCode().isNonTrivialPush()) ? pushValue : EWord.of(op.value());
 
       heightTracers.get(i).apply(op.height());
       valHiTracers.get(i).apply(eValue.hi());

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

@@ -16,6 +16,7 @@
 package net.consensys.linea.zktracer.module.hub.fragment.common;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static net.consensys.linea.zktracer.Trace.EVM_INST_PUSH0;
 import static net.consensys.linea.zktracer.module.hub.HubProcessingPhase.TX_EXEC;
 import static net.consensys.linea.zktracer.module.hub.signals.Exceptions.*;
 import static net.consensys.linea.zktracer.module.hub.signals.TracedException.*;
@@ -172,10 +173,10 @@ static int computePcNew(final Hub hub, final int pc, boolean stackException, boo
       return 0;
     }
 
-    if (!opCode.isPush() && !opCode.isJump()) return pc + 1;
+    if (!opCode.isNonTrivialPush() && !opCode.isJump()) return pc + 1;
 
-    if (opCode.getData().isPush()) {
-      return pc + 1 + (opCode.byteValue() - OpCode.PUSH1.byteValue() + 1);
+    if (opCode.isNonTrivialPush()) {
+      return pc + 1 + (opCode.byteValue() - EVM_INST_PUSH0);
     }
 
     if (opCode.isJump()) {
@@ -191,7 +192,8 @@ static int computePcNew(final Hub hub, final int pc, boolean stackException, boo
       }
 
       if (opCode.equals(OpCode.JUMPI)) {
-        BigInteger condition = hub.currentFrame().frame().getStackItem(1).toUnsignedBigInteger();
+        final BigInteger condition =
+            hub.currentFrame().frame().getStackItem(1).toUnsignedBigInteger();
         if (!condition.equals(BigInteger.ZERO)) {
           return attemptedPcNew;
         } else {

arithmetization/src/main/java/net/consensys/linea/zktracer/module/romlex/RomOperation.java

@@ -15,14 +15,7 @@
 
 package net.consensys.linea.zktracer.module.romlex;
 
-import static net.consensys.linea.zktracer.Trace.EVM_INST_INVALID;
-import static net.consensys.linea.zktracer.Trace.EVM_INST_JUMPDEST;
-import static net.consensys.linea.zktracer.Trace.EVM_INST_PUSH1;
-import static net.consensys.linea.zktracer.Trace.EVM_INST_PUSH32;
-import static net.consensys.linea.zktracer.Trace.LLARGE;
-import static net.consensys.linea.zktracer.Trace.LLARGEMO;
-import static net.consensys.linea.zktracer.Trace.WORD_SIZE;
-import static net.consensys.linea.zktracer.Trace.WORD_SIZE_MO;
+import static net.consensys.linea.zktracer.Trace.*;
 import static net.consensys.linea.zktracer.types.Utils.rightPadTo;
 
 import lombok.EqualsAndHashCode;
@@ -31,6 +24,7 @@
 import lombok.experimental.Accessors;
 import net.consensys.linea.zktracer.Trace;
 import net.consensys.linea.zktracer.container.ModuleOperation;
+import net.consensys.linea.zktracer.opcode.OpCode;
 import net.consensys.linea.zktracer.types.UnsignedByte;
 import org.apache.tuweni.bytes.Bytes;
 
@@ -63,8 +57,8 @@ public void trace(Trace.Rom trace, int cfi, int cfiInfty) {
     Bytes pushValueLow = Bytes.minimalBytes(0);
 
     for (int i = 0; i < chunkRowSize; i++) {
-      boolean codeSizeReached = i >= codeSize;
-      int sliceNumber = i / LLARGE;
+      final boolean codeSizeReached = i >= codeSize;
+      final int sliceNumber = i / LLARGE;
 
       // Fill Generic columns
       trace
@@ -99,13 +93,13 @@ public void trace(Trace.Rom trace, int cfi, int cfiInfty) {
 
       // Deal when not in a PUSH instruction
       if (pushParameter == 0) {
-        UnsignedByte opCode = UnsignedByte.of(dataPadded.get(i));
-        final boolean isPush =
-            EVM_INST_PUSH1 <= opCode.toInteger() && opCode.toInteger() <= EVM_INST_PUSH32;
+        final UnsignedByte opCodeUB = UnsignedByte.of(dataPadded.get(i));
+        final OpCode opcode = OpCode.of(opCodeUB.toInteger());
+        final boolean isPush = opcode.isNonTrivialPush();
 
         // The OpCode is a PUSH instruction
         if (isPush) {
-          pushParameter = opCode.toInteger() - EVM_INST_PUSH1 + 1;
+          pushParameter = opCodeUB.toInteger() - EVM_INST_PUSH0;
           if (pushParameter > LLARGE) {
             pushValueHigh = dataPadded.slice(i + 1, pushParameter - LLARGE);
             pushValueLow = dataPadded.slice(i + 1 + pushParameter - LLARGE, LLARGE);
@@ -117,14 +111,14 @@ public void trace(Trace.Rom trace, int cfi, int cfiInfty) {
         trace
             .isPush(isPush)
             .isPushData(false)
-            .opcode(opCode)
+            .opcode(opCodeUB)
             .pushParameter(UnsignedByte.of(pushParameter))
             .counterPush(UnsignedByte.ZERO)
             .pushValueAcc(Bytes.EMPTY)
             .pushValueHi(pushValueHigh)
             .pushValueLo(pushValueLow)
             .pushFunnelBit(false)
-            .isJumpdest(opCode.toInteger() == EVM_INST_JUMPDEST);
+            .isJumpdest(opcode.getData().isJumpDest());
       }
       // Deal when in a PUSH instruction
       else {

arithmetization/src/main/java/net/consensys/linea/zktracer/module/tables/instructionDecoder/InstructionDecoder.java

@@ -118,17 +118,20 @@ public List<Trace.ColumnHeader> columnHeaders() {
   @Override
   public void commit(Trace trace) {
     for (int i = 0; i < 256; i++) {
-      final OpCodeData op = OpCode.of(i).getData();
-
-      traceFamily(op, trace.instdecoder);
-      traceStackSettings(op, trace.instdecoder);
-      traceBillingSettings(op, trace.instdecoder);
-      trace
-          .instdecoder
-          .opcode(UnsignedByte.of(i))
-          .isPush(op.isPush())
-          .isJumpdest(op.isJumpDest())
-          .validateRow();
+      traceOpcode(i, trace);
     }
   }
+
+  protected void traceOpcode(final int i, final Trace trace) {
+    final OpCodeData op = OpCode.of(i).getData();
+    traceFamily(op, trace.instdecoder);
+    traceStackSettings(op, trace.instdecoder);
+    traceBillingSettings(op, trace.instdecoder);
+    trace
+        .instdecoder
+        .opcode(UnsignedByte.of(i))
+        .isPush(op.isNonTrivialPush())
+        .isJumpdest(op.isJumpDest())
+        .validateRow();
+  }
 }