make inst decoder fork dependant

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

Author: letypequividelespoubelles

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

@@ -379,7 +379,7 @@ public Hub(final ChainConfig chain) {
     mmu = new Mmu(euc, wcp);
     mmio = new Mmio(mmu);
 
-    refTableModules = List.of(new BinRt(), new InstructionDecoder(), new ShfRt());
+    refTableModules = List.of(new BinRt(), setInstructionDecoder(), new ShfRt());
 
     modules =
         Stream.concat(
@@ -1073,4 +1073,8 @@ protected TransactionStack setTransactionStack() {
   protected TxnData setTxnData() {
     return null;
   }
+
+  protected InstructionDecoder setInstructionDecoder() {
+    throw new IllegalStateException("must be implemented");
+  }
 }

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

@@ -18,6 +18,8 @@
 import net.consensys.linea.zktracer.ChainConfig;
 import net.consensys.linea.zktracer.module.hub.state.LondonTransactionStack;
 import net.consensys.linea.zktracer.module.hub.state.TransactionStack;
+import net.consensys.linea.zktracer.module.tables.instructionDecoder.InstructionDecoder;
+import net.consensys.linea.zktracer.module.tables.instructionDecoder.LondonInstructionDecoder;
 import net.consensys.linea.zktracer.module.txndata.module.LondonTxnData;
 import net.consensys.linea.zktracer.module.txndata.module.TxnData;
 
@@ -35,4 +37,9 @@ protected TransactionStack setTransactionStack() {
   protected TxnData setTxnData() {
     return new LondonTxnData(this, wcp(), euc());
   }
+
+  @Override
+  protected InstructionDecoder setInstructionDecoder() {
+    return new LondonInstructionDecoder();
+  }
 }

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

@@ -18,6 +18,8 @@
 import net.consensys.linea.zktracer.ChainConfig;
 import net.consensys.linea.zktracer.module.hub.state.ShanghaiTransactionStack;
 import net.consensys.linea.zktracer.module.hub.state.TransactionStack;
+import net.consensys.linea.zktracer.module.tables.instructionDecoder.InstructionDecoder;
+import net.consensys.linea.zktracer.module.tables.instructionDecoder.ShanghaiInstructionDecoder;
 import net.consensys.linea.zktracer.module.txndata.module.ShanghaiTxnData;
 import net.consensys.linea.zktracer.module.txndata.module.TxnData;
 
@@ -35,4 +37,9 @@ protected TransactionStack setTransactionStack() {
   protected TxnData setTxnData() {
     return new ShanghaiTxnData(this, wcp(), euc());
   }
+
+  @Override
+  protected InstructionDecoder setInstructionDecoder() {
+    return new ShanghaiInstructionDecoder();
+  }
 }

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

@@ -26,7 +26,7 @@
 import net.consensys.linea.zktracer.opcode.gas.MxpType;
 import net.consensys.linea.zktracer.types.UnsignedByte;
 
-public final class InstructionDecoder implements Module {
+public abstract class InstructionDecoder implements Module {
   private static void traceFamily(OpCodeData op, Trace.Instdecoder trace) {
     trace
         .familyAdd(op.instructionFamily() == InstructionFamily.ADD)
@@ -120,15 +120,31 @@ 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.isPushNotZero())
-          .isJumpdest(op.isJumpDest())
-          .validateRow();
+      if (op.isPushZero()) {
+        tracePushZero(trace);
+        continue;
+      }
+      traceOpcode(op, trace);
     }
   }
+
+  protected void traceOpcode(final OpCodeData op, final Trace trace) {
+    traceFamily(op, trace.instdecoder);
+    traceStackSettings(op, trace.instdecoder);
+    traceBillingSettings(op, trace.instdecoder);
+    trace
+        .instdecoder
+        .opcode(UnsignedByte.of(op.value()))
+        .isPush(op.isPushNotZero())
+        .isJumpdest(op.isJumpDest())
+        .validateRow();
+  }
+
+  protected void tracePushZero(Trace trace) {
+    throw new IllegalStateException("must be implemented");
+  }
+
+  protected void traceAsInvalid(final int opcode, final Trace trace) {
+    trace.instdecoder.familyInvalid(true).opcode(UnsignedByte.of(opcode)).fillAndValidateRow();
+  }
 }

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

@@ -0,0 +1,27 @@
+/*
+ * Copyright ConsenSys Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package net.consensys.linea.zktracer.module.tables.instructionDecoder;
+
+import static net.consensys.linea.zktracer.Trace.EVM_INST_PUSH0;
+
+import net.consensys.linea.zktracer.Trace;
+
+public class LondonInstructionDecoder extends InstructionDecoder {
+  @Override
+  protected void tracePushZero(Trace trace) {
+    traceAsInvalid(EVM_INST_PUSH0, trace);
+  }
+}

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

@@ -0,0 +1,27 @@
+/*
+ * Copyright ConsenSys Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package net.consensys.linea.zktracer.module.tables.instructionDecoder;
+
+import static net.consensys.linea.zktracer.opcode.OpCode.PUSH0;
+
+import net.consensys.linea.zktracer.Trace;
+
+public class ShanghaiInstructionDecoder extends LondonInstructionDecoder {
+  @Override
+  protected void tracePushZero(Trace trace) {
+    traceOpcode(PUSH0.getData(), trace);
+  }
+}

arithmetization/src/main/java/net/consensys/linea/zktracer/opcode/OpCodeData.java

@@ -78,6 +78,10 @@ public boolean isPushNotZero() {
     return (EVM_INST_PUSH1 <= value) && (value <= EVM_INST_PUSH32);
   }
 
+  public boolean isPushZero() {
+    return EVM_INST_PUSH0 == value;
+  }
+
   public boolean isJumpDest() {
     return value == EVM_INST_JUMPDEST;
   }