refactor: group RLPs modules, use retro-compatible module keys (#508)

Consensys · Dec 20, 2023 · e656ae0 · e656ae0
1 parent 3ee98ea
commit e656ae0
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 23 deletions.
diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java
@@ -58,9 +58,9 @@
 import net.consensys.linea.zktracer.module.mod.Mod;
 import net.consensys.linea.zktracer.module.mul.Mul;
 import net.consensys.linea.zktracer.module.mxp.Mxp;
-import net.consensys.linea.zktracer.module.rlpAddr.RlpAddr;
-import net.consensys.linea.zktracer.module.rlp_txn.RlpTxn;
-import net.consensys.linea.zktracer.module.rlp_txrcpt.RlpTxrcpt;
+import net.consensys.linea.zktracer.module.rlp.addr.RlpAddr;
+import net.consensys.linea.zktracer.module.rlp.txn.RlpTxn;
+import net.consensys.linea.zktracer.module.rlp.txrcpt.RlpTxrcpt;
 import net.consensys.linea.zktracer.module.rom.Rom;
 import net.consensys.linea.zktracer.module.romLex.RomLex;
 import net.consensys.linea.zktracer.module.shf.Shf;

diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/logData/LogData.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/logData/LogData.java
@@ -23,8 +23,8 @@
 
 import net.consensys.linea.zktracer.ColumnHeader;
 import net.consensys.linea.zktracer.module.Module;
-import net.consensys.linea.zktracer.module.rlp_txrcpt.RlpTxrcpt;
-import net.consensys.linea.zktracer.module.rlp_txrcpt.RlpTxrcptChunk;
+import net.consensys.linea.zktracer.module.rlp.txrcpt.RlpTxrcpt;
+import net.consensys.linea.zktracer.module.rlp.txrcpt.RlpTxrcptChunk;
 import org.apache.tuweni.bytes.Bytes;
 import org.hyperledger.besu.evm.log.Log;
 

diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/logInfo/LogInfo.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/logInfo/LogInfo.java
@@ -21,8 +21,8 @@
 
 import net.consensys.linea.zktracer.ColumnHeader;
 import net.consensys.linea.zktracer.module.Module;
-import net.consensys.linea.zktracer.module.rlp_txrcpt.RlpTxrcpt;
-import net.consensys.linea.zktracer.module.rlp_txrcpt.RlpTxrcptChunk;
+import net.consensys.linea.zktracer.module.rlp.txrcpt.RlpTxrcpt;
+import net.consensys.linea.zktracer.module.rlp.txrcpt.RlpTxrcptChunk;
 import org.apache.tuweni.bytes.Bytes32;
 import org.hyperledger.besu.evm.log.Log;
 

diff --git a/...inea/zktracer/module/rlpAddr/RlpAddr.java → ...nea/zktracer/module/rlp/addr/RlpAddr.java b/...inea/zktracer/module/rlpAddr/RlpAddr.java → ...nea/zktracer/module/rlp/addr/RlpAddr.java
@@ -13,7 +13,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package net.consensys.linea.zktracer.module.rlpAddr;
+package net.consensys.linea.zktracer.module.rlp.addr;
 
 import static net.consensys.linea.zktracer.module.rlputils.Pattern.byteCounting;
 import static net.consensys.linea.zktracer.types.AddressUtils.getCreate2Address;

diff --git a/...zktracer/module/rlpAddr/RlpAddrChunk.java → ...ktracer/module/rlp/addr/RlpAddrChunk.java b/...zktracer/module/rlpAddr/RlpAddrChunk.java → ...ktracer/module/rlp/addr/RlpAddrChunk.java
@@ -13,7 +13,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package net.consensys.linea.zktracer.module.rlpAddr;
+package net.consensys.linea.zktracer.module.rlp.addr;
 
 import java.math.BigInteger;
 import java.util.Optional;

diff --git a/.../linea/zktracer/module/rlpAddr/Trace.java → ...linea/zktracer/module/rlp/addr/Trace.java b/.../linea/zktracer/module/rlpAddr/Trace.java → ...linea/zktracer/module/rlp/addr/Trace.java
@@ -13,7 +13,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package net.consensys.linea.zktracer.module.rlpAddr;
+package net.consensys.linea.zktracer.module.rlp.addr;
 
 import java.nio.MappedByteBuffer;
 import java.util.BitSet;

diff --git a/...linea/zktracer/module/rlp_txn/RlpTxn.java → ...linea/zktracer/module/rlp/txn/RlpTxn.java b/...linea/zktracer/module/rlp_txn/RlpTxn.java → ...linea/zktracer/module/rlp/txn/RlpTxn.java
@@ -13,7 +13,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package net.consensys.linea.zktracer.module.rlp_txn;
+package net.consensys.linea.zktracer.module.rlp.txn;
 
 import static net.consensys.linea.zktracer.module.Util.getTxTypeAsInt;
 import static net.consensys.linea.zktracer.module.rlputils.Pattern.byteCounting;
@@ -65,7 +65,7 @@ public RlpTxn(RomLex _romLex) {
 
   @Override
   public String moduleKey() {
-    return "RLP_TXN";
+    return "TX_RLP";
   }
 
   public static final int LLARGE = TxnrlpTrace.LLARGE.intValue();

diff --git a/.../zktracer/module/rlp_txn/RlpTxnChunk.java → .../zktracer/module/rlp/txn/RlpTxnChunk.java b/.../zktracer/module/rlp_txn/RlpTxnChunk.java → .../zktracer/module/rlp/txn/RlpTxnChunk.java
@@ -13,7 +13,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package net.consensys.linea.zktracer.module.rlp_txn;
+package net.consensys.linea.zktracer.module.rlp.txn;
 
 import java.util.Optional;
 

diff --git a/...er/module/rlp_txn/RlpTxnColumnsValue.java → ...er/module/rlp/txn/RlpTxnColumnsValue.java b/...er/module/rlp_txn/RlpTxnColumnsValue.java → ...er/module/rlp/txn/RlpTxnColumnsValue.java
@@ -13,7 +13,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package net.consensys.linea.zktracer.module.rlp_txn;
+package net.consensys.linea.zktracer.module.rlp.txn;
 
 import java.math.BigInteger;
 

diff --git a/.../linea/zktracer/module/rlp_txn/Trace.java → .../linea/zktracer/module/rlp/txn/Trace.java b/.../linea/zktracer/module/rlp_txn/Trace.java → .../linea/zktracer/module/rlp/txn/Trace.java
@@ -13,7 +13,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package net.consensys.linea.zktracer.module.rlp_txn;
+package net.consensys.linea.zktracer.module.rlp.txn;
 
 import java.nio.MappedByteBuffer;
 import java.util.BitSet;

diff --git a/.../zktracer/module/rlp_txn/TxnrlpTrace.java → .../zktracer/module/rlp/txn/TxnrlpTrace.java b/.../zktracer/module/rlp_txn/TxnrlpTrace.java → .../zktracer/module/rlp/txn/TxnrlpTrace.java
@@ -13,7 +13,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package net.consensys.linea.zktracer.module.rlp_txn;
+package net.consensys.linea.zktracer.module.rlp.txn;
 
 import java.math.BigInteger;
 

diff --git a/...zktracer/module/rlp_txrcpt/RlpTxrcpt.java → ...zktracer/module/rlp/txrcpt/RlpTxrcpt.java b/...zktracer/module/rlp_txrcpt/RlpTxrcpt.java → ...zktracer/module/rlp/txrcpt/RlpTxrcpt.java
@@ -13,7 +13,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package net.consensys.linea.zktracer.module.rlp_txrcpt;
+package net.consensys.linea.zktracer.module.rlp.txrcpt;
 
 import static net.consensys.linea.zktracer.module.rlputils.Pattern.byteCounting;
 import static net.consensys.linea.zktracer.module.rlputils.Pattern.outerRlpSize;

diff --git a/...cer/module/rlp_txrcpt/RlpTxrcptChunk.java → ...cer/module/rlp/txrcpt/RlpTxrcptChunk.java b/...cer/module/rlp_txrcpt/RlpTxrcptChunk.java → ...cer/module/rlp/txrcpt/RlpTxrcptChunk.java
@@ -13,7 +13,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package net.consensys.linea.zktracer.module.rlp_txrcpt;
+package net.consensys.linea.zktracer.module.rlp.txrcpt;
 
 import java.util.List;
 

diff --git a/...r/module/rlp_txrcpt/RlpTxrcptColumns.java → ...r/module/rlp/txrcpt/RlpTxrcptColumns.java b/...r/module/rlp_txrcpt/RlpTxrcptColumns.java → ...r/module/rlp/txrcpt/RlpTxrcptColumns.java
@@ -13,7 +13,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package net.consensys.linea.zktracer.module.rlp_txrcpt;
+package net.consensys.linea.zktracer.module.rlp.txrcpt;
 
 import java.math.BigInteger;
 

diff --git a/...cer/module/rlp_txrcpt/RlpTxrcptTrace.java → ...cer/module/rlp/txrcpt/RlpTxrcptTrace.java b/...cer/module/rlp_txrcpt/RlpTxrcptTrace.java → ...cer/module/rlp/txrcpt/RlpTxrcptTrace.java
@@ -13,7 +13,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package net.consensys.linea.zktracer.module.rlp_txrcpt;
+package net.consensys.linea.zktracer.module.rlp.txrcpt;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import net.consensys.linea.zktracer.module.ModuleTrace;

diff --git a/...nea/zktracer/module/rlp_txrcpt/Trace.java → ...nea/zktracer/module/rlp/txrcpt/Trace.java b/...nea/zktracer/module/rlp_txrcpt/Trace.java → ...nea/zktracer/module/rlp/txrcpt/Trace.java
@@ -13,7 +13,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package net.consensys.linea.zktracer.module.rlp_txrcpt;
+package net.consensys.linea.zktracer.module.rlp.txrcpt;
 
 import java.nio.MappedByteBuffer;
 import java.util.BitSet;

diff --git a/arithmetization/src/main/resources/spillings.toml b/arithmetization/src/main/resources/spillings.toml
@@ -14,7 +14,7 @@ MUL = 9
 MXP = 4
 MMU = 10
 RLP_ADDR = 7
-RLP_TXN = 7
+TX_RLP = 7
 RLP_TXRCPT = 7
 ROM = 2
 ROM_LEX = 1

diff --git a/arithmetization/src/test/java/net/consensys/linea/zktracer/module/hub/TestTwoPlusTwo.java b/arithmetization/src/test/java/net/consensys/linea/zktracer/module/hub/TestTwoPlusTwo.java
@@ -29,4 +29,9 @@ void testAdd() {
     BytecodeRunner.of(BytecodeCompiler.newProgram().push(32).push(27).op(OpCode.ADD).compile())
         .run();
   }
+
+  @Test
+  void testBreakingCall() {
+    BytecodeRunner.of(BytecodeCompiler.newProgram().push(32).op(OpCode.CALL).compile()).run();
+  }
 }
diff --git a/...ation/src/test/java/net/consensys/linea/zktracer/module/rlp_txrcpt/RandomTxrcptTests.java b/...ation/src/test/java/net/consensys/linea/zktracer/module/rlp_txrcpt/RandomTxrcptTests.java
@@ -24,6 +24,7 @@
 
 import net.consensys.linea.zktracer.module.logData.LogData;
 import net.consensys.linea.zktracer.module.logInfo.LogInfo;
+import net.consensys.linea.zktracer.module.rlp.txrcpt.RlpTxrcpt;
 import net.consensys.linea.zktracer.opcode.OpCodes;
 import net.consensys.linea.zktracer.testing.ToyAccount;
 import net.consensys.linea.zktracer.testing.ToyTransaction;

diff --git a/zkevm-constraints b/zkevm-constraints