fix: blockdata line counting & traceEndBlock trigger in ref tests (#1751

) * blockdata fix: missing one count for traxce limit Signed-off-by: F Bojarski <[email protected]> * update blockdata constraints Signed-off-by: F Bojarski <[email protected]> * fix: calling twice traceEndBlock for ref tests Signed-off-by: F Bojarski <[email protected]> --------- Signed-off-by: F Bojarski <[email protected]>
Consensys · Jan 31, 2025 · dadff1e · dadff1e
1 parent 29b18f3
commit dadff1e
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 183 deletions.
diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/blockdata/Blockdata.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/blockdata/Blockdata.java
@@ -19,7 +19,6 @@
 import static net.consensys.linea.zktracer.module.blockdata.Trace.nROWS_DEPTH;
 import static net.consensys.linea.zktracer.module.constants.GlobalConstants.LLARGE;
 
-import java.math.BigInteger;
 import java.nio.MappedByteBuffer;
 import java.util.*;
 
@@ -30,8 +29,8 @@
 import net.consensys.linea.zktracer.module.txndata.TxnData;
 import net.consensys.linea.zktracer.module.wcp.Wcp;
 import net.consensys.linea.zktracer.opcode.OpCode;
-import net.consensys.linea.zktracer.types.EWord;
 import org.apache.tuweni.bytes.Bytes;
+import org.hyperledger.besu.evm.worldstate.WorldView;
 import org.hyperledger.besu.plugin.data.BlockBody;
 import org.hyperledger.besu.plugin.data.BlockHeader;
 
@@ -40,12 +39,14 @@ public class Blockdata implements Module {
   private final Wcp wcp;
   private final Euc euc;
   private final TxnData txnData;
+  private final Bytes chainId;
 
-  private final Deque<BlockdataOperation> operations = new ArrayDeque<>();
+  private final List<BlockdataOperation> operations = new ArrayList<>();
   private long firstBlockNumber;
-  private Bytes chainId;
 
-  final OpCode[] opCodes = {
+  private boolean conflationFinished = false;
+
+  private static final OpCode[] opCodes = {
     OpCode.COINBASE,
     OpCode.TIMESTAMP,
     OpCode.NUMBER,
@@ -55,10 +56,6 @@ public class Blockdata implements Module {
     OpCode.BASEFEE
   };
 
-  public void setChainId(BigInteger chainId) {
-    this.chainId = EWord.of(chainId).lo();
-  }
-
   @Override
   public String moduleKey() {
     return "BLOCK_DATA";
@@ -81,6 +78,11 @@ public void traceStartConflation(final long blockCount) {
     euc.additionalRows.add(8);
   }
 
+  @Override
+  public void traceEndConflation(final WorldView state) {
+    conflationFinished = true;
+  }
+
   @Override
   public void traceEndBlock(final BlockHeader blockHeader, final BlockBody blockBody) {
     final long blockNumber = blockHeader.getNumber();
@@ -113,7 +115,7 @@ public void popTransaction() {}
 
   @Override
   public int lineCount() {
-    final int numberOfBlock = (operations.size() / opCodes.length);
+    final int numberOfBlock = (operations.size() / opCodes.length) + (conflationFinished ? 0 : 1);
     return numberOfBlock * nROWS_DEPTH;
   }
 

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
@@ -113,6 +113,7 @@
 import net.consensys.linea.zktracer.runtime.stack.StackContext;
 import net.consensys.linea.zktracer.runtime.stack.StackLine;
 import net.consensys.linea.zktracer.types.Bytecode;
+import net.consensys.linea.zktracer.types.EWord;
 import net.consensys.linea.zktracer.types.MemoryRange;
 import net.consensys.linea.zktracer.types.TransactionProcessingMetadata;
 import org.apache.tuweni.bytes.Bytes;
@@ -388,8 +389,7 @@ public Hub(final Address l2l1ContractAddress, final Bytes l2l1Topic, final BigIn
     l2L1Logs = new L2L1Logs(l2Block);
     keccak = new Keccak(ecRecoverEffectiveCall, l2Block);
     shakiraData = new ShakiraData(wcp, sha256Blocks, keccak, ripemdBlocks);
-    blockdata = new Blockdata(wcp, euc, txnData);
-    blockdata.setChainId(chainId);
+    blockdata = new Blockdata(wcp, euc, txnData, EWord.of(chainId));
     mmu = new Mmu(euc, wcp);
     mmio = new Mmio(mmu);
 

diff --git a/.../ContextFamilyTests/MessageCallTests.java → ...ssing/contextFamily/MessageCallTests.java b/.../ContextFamilyTests/MessageCallTests.java → ...ssing/contextFamily/MessageCallTests.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.zktracer.instructionprocessing.ContextFamilyTests;
+package net.consensys.linea.zktracer.instructionprocessing.contextFamily;
 
 import static net.consensys.linea.zktracer.instructionprocessing.utilities.Calls.appendCall;
 import static net.consensys.linea.zktracer.instructionprocessing.utilities.MonoOpCodeSmcs.keyPair;

diff --git a/...xtFamilyTests/RootOfMessageCallTests.java → ...contextFamily/RootOfMessageCallTests.java b/...xtFamilyTests/RootOfMessageCallTests.java → ...contextFamily/RootOfMessageCallTests.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.zktracer.instructionprocessing.ContextFamilyTests;
+package net.consensys.linea.zktracer.instructionprocessing.contextFamily;
 
 import static net.consensys.linea.zktracer.instructionprocessing.utilities.MultiOpCodeSmcs.allContextOpCodes;
 

diff --git a/...tionprocessing/ContextFamilyTests/todo.md → ...structionprocessing/contextFamily/todo.md b/...tionprocessing/ContextFamilyTests/todo.md → ...structionprocessing/contextFamily/todo.md
diff --git a/...ocessing/ZeroSizeTests/CallArguments.java → ...ionprocessing/zeroSize/CallArguments.java b/...ocessing/ZeroSizeTests/CallArguments.java → ...ionprocessing/zeroSize/CallArguments.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.zktracer.instructionprocessing.ZeroSizeTests;
+package net.consensys.linea.zktracer.instructionprocessing.zeroSize;
 
 import static net.consensys.linea.zktracer.instructionprocessing.utilities.Calls.*;
 

diff --git a/...izeTests/CallArgumentsMaybeRedundant.java → ...zeroSize/CallArgumentsMaybeRedundant.java b/...izeTests/CallArgumentsMaybeRedundant.java → ...zeroSize/CallArgumentsMaybeRedundant.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.zktracer.instructionprocessing.ZeroSizeTests;
+package net.consensys.linea.zktracer.instructionprocessing.zeroSize;
 
 import java.util.List;
 

diff --git a/.../ZeroSizeTests/ReturnRevertArguments.java → ...ssing/zeroSize/ReturnRevertArguments.java b/.../ZeroSizeTests/ReturnRevertArguments.java → ...ssing/zeroSize/ReturnRevertArguments.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package net.consensys.linea.zktracer.instructionprocessing.ZeroSizeTests;
+package net.consensys.linea.zktracer.instructionprocessing.zeroSize;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static net.consensys.linea.zktracer.instructionprocessing.utilities.MonoOpCodeSmcs.keyPair;

diff --git a/arithmetization/src/test/java/net/consensys/linea/zktracer/module/rlptxn/TestRandomTxns.java b/arithmetization/src/test/java/net/consensys/linea/zktracer/module/rlptxn/TestRandomTxns.java
diff --git a/reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java b/reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java
@@ -412,6 +412,8 @@ public static void executeTest(final BlockchainReferenceTestCaseSpec spec) {
                 ? HeaderValidationMode.LIGHT
                 : HeaderValidationMode.FULL;
 
+        // Note: somehow this function is calling traceEndBlock through
+        // blockValidator.validateAndProcessBlock
         final BlockImportResult importResult =
             blockImporter.importBlock(context, block, validationMode, validationMode);
         log.info(
@@ -425,7 +427,6 @@ public static void executeTest(final BlockchainReferenceTestCaseSpec spec) {
                 importResult.isImported(),
                 candidateBlock.isValid());
 
-        zkTracer.traceEndBlock(block.getHeader(), block.getBody());
       } catch (final RLPException e) {
         log.info("caught RLP exception, checking it's invalid {}", candidateBlock.isValid());
         assertThat(candidateBlock.isValid()).isFalse();