Fix for initialization and finalization sections

arithmetization/src/main/java/net/consensys/linea/zktracer/module/blockdata/Blockdata.java

@@ -46,6 +46,7 @@ public class Blockdata implements Module {
   private int traceCounter = 0;
   private long firstBlockNumber;
   private Bytes chainId;
+  private boolean shouldBeTraced = true;
 
   final OpCode[] opCodes = {
     OpCode.COINBASE,
@@ -75,29 +76,35 @@ public void traceStartConflation(final long blockCount) {
   public void traceEndBlock(final BlockHeader blockHeader, final BlockBody blockBody) {
     final long blockNumber = blockHeader.getNumber();
     firstBlockNumber = (traceCounter < opCodes.length) ? blockNumber : firstBlockNumber;
-    for (OpCode opCode : opCodes) {
-      BlockdataOperation operation =
-          new BlockdataOperation(
-              blockHeader,
-              prevBlockHeader,
-              txnData.currentBlock().getNbOfTxsInBlock(),
-              wcp,
-              euc,
-              chainId,
-              opCode,
-              firstBlockNumber);
-      operations.addLast(operation);
-      // Increase counter to track where we are in the conflation
-      traceCounter++;
+    if (shouldBeTraced) {
+      for (OpCode opCode : opCodes) {
+        BlockdataOperation operation =
+            new BlockdataOperation(
+                txnData.hub(),
+                blockHeader,
+                prevBlockHeader,
+                txnData.currentBlock().getNbOfTxsInBlock(),
+                wcp,
+                euc,
+                chainId,
+                opCode,
+                firstBlockNumber);
+        operations.addLast(operation);
+        // Increase counter to track where we are in the conflation
+        traceCounter++;
+      }
     }
     prevBlockHeader = blockHeader;
+    shouldBeTraced = false;
   }
 
   @Override
   public void traceEndConflation(final WorldView state) {}
 
   @Override
-  public void enterTransaction() {}
+  public void enterTransaction() {
+    shouldBeTraced = true;
+  }
 
   @Override
   public void popTransaction() {}

arithmetization/src/main/java/net/consensys/linea/zktracer/module/blockdata/BlockdataOperation.java

@@ -23,9 +23,7 @@
 import static net.consensys.linea.zktracer.module.constants.GlobalConstants.LLARGE;
 import static net.consensys.linea.zktracer.module.constants.GlobalConstants.WCP_INST_GEQ;
 import static net.consensys.linea.zktracer.module.constants.GlobalConstants.WCP_INST_LEQ;
-import static net.consensys.linea.zktracer.module.constants.Trace.GAS_LIMIT_ADJUSTMENT_FACTOR;
-import static net.consensys.linea.zktracer.module.constants.Trace.LINEA_GAS_LIMIT_MAXIMUM;
-import static net.consensys.linea.zktracer.module.constants.Trace.LINEA_GAS_LIMIT_MINIMUM;
+import static net.consensys.linea.zktracer.module.constants.Trace.*;
 import static net.consensys.linea.zktracer.types.Conversions.booleanToBytes;
 
 import java.math.BigInteger;
@@ -36,6 +34,7 @@
 import lombok.experimental.Accessors;
 import net.consensys.linea.zktracer.container.ModuleOperation;
 import net.consensys.linea.zktracer.module.euc.Euc;
+import net.consensys.linea.zktracer.module.hub.Hub;
 import net.consensys.linea.zktracer.module.wcp.Wcp;
 import net.consensys.linea.zktracer.opcode.OpCode;
 import net.consensys.linea.zktracer.types.EWord;
@@ -46,6 +45,7 @@
 @Accessors(fluent = true)
 @Getter
 public class BlockdataOperation extends ModuleOperation {
+  private final Hub hub;
   private final Wcp wcp;
   private final Euc euc;
   private final Bytes chainId;
@@ -70,6 +70,7 @@ public class BlockdataOperation extends ModuleOperation {
   private final boolean[] eucFlag;
 
   public BlockdataOperation(
+      Hub hub,
       BlockHeader blockHeader,
       BlockHeader prevBlockHeader,
       int relTxMax,
@@ -79,6 +80,7 @@ public BlockdataOperation(
       OpCode opCode,
       long firstBlockNumber) {
     // Data from blockHeader
+    this.hub = hub;
     this.blockHeader = blockHeader;
     this.prevBlockHeader = prevBlockHeader;
 
@@ -131,7 +133,7 @@ public BlockdataOperation(
   }
 
   private void handleCoinbase() {
-    data = EWord.ofHexString(blockHeader.getCoinbase().toHexString());
+    data = EWord.ofHexString(hub.coinbaseAddress.toHexString());
     // row i
     wcpCallToLT(0, data, POWER_256_20);
   }
@@ -173,14 +175,16 @@ private void handleGasLimit() {
     wcpCallToGEQ(0, data, EWord.of(LINEA_GAS_LIMIT_MINIMUM));
 
     // row i + 1
-    wcpCallToLEQ(1, data, EWord.of(LINEA_GAS_LIMIT_MAXIMUM));
+    wcpCallToLEQ(1, data, EWord.of(Bytes.ofUnsignedLong(LINEA_GAS_LIMIT_MAXIMUM)));
 
     if (!firstBlockInConflation) {
       EWord prevGasLimit = EWord.of(prevBlockHeader.getGasLimit());
       // row i + 2
       Bytes maxDeviation = eucCall(2, prevGasLimit, EWord.of(GAS_LIMIT_ADJUSTMENT_FACTOR));
       // row i + 3
-      wcpCallToLT(3, data, EWord.of(prevGasLimit.toLong() + maxDeviation.toLong()));
+      BigInteger safeGasLimitUpperBound =
+          prevGasLimit.getAsBigInteger().add(maxDeviation.toUnsignedBigInteger());
+      wcpCallToLT(3, data, EWord.of(safeGasLimitUpperBound));
 
       // row i + 4
       wcpCallToGT(
@@ -223,10 +227,11 @@ public void trace(Trace trace) {
           .isChainid(opCode == OpCode.CHAINID)
           .isBasefee(opCode == OpCode.BASEFEE)
           .inst(UnsignedByte.of(opCode.byteValue()))
-          .coinbaseHi(blockHeader.getCoinbase().slice(0, 4).toLong())
-          .coinbaseLo(blockHeader.getCoinbase().slice(4, LLARGE))
-          .blockGasLimit(blockHeader.getGasLimit())
-          .basefee(blockHeader.getBaseFee().get().getAsBigInteger().longValue())
+          .coinbaseHi(hub.coinbaseAddress.slice(0, 4).toLong())
+          .coinbaseLo(hub.coinbaseAddress.slice(4, LLARGE))
+          .blockGasLimit(Bytes.ofUnsignedLong(blockHeader.getGasLimit()))
+          .basefee(
+              Bytes.ofUnsignedLong(blockHeader.getBaseFee().get().getAsBigInteger().longValue()))
           .firstBlockNumber(firstBlockNumber)
           .relBlock((short) relBlock)
           .relTxNumMax((short) relTxMax)

arithmetization/src/main/java/net/consensys/linea/zktracer/module/blockdata/Trace.java

@@ -78,8 +78,8 @@ static List<ColumnHeader> headers(int length) {
     headers.add(new ColumnHeader("blockdata.ARG_1_LO", 16, length));
     headers.add(new ColumnHeader("blockdata.ARG_2_HI", 16, length));
     headers.add(new ColumnHeader("blockdata.ARG_2_LO", 16, length));
-    headers.add(new ColumnHeader("blockdata.BASEFEE", 6, length));
-    headers.add(new ColumnHeader("blockdata.BLOCK_GAS_LIMIT", 6, length));
+    headers.add(new ColumnHeader("blockdata.BASEFEE", 8, length));
+    headers.add(new ColumnHeader("blockdata.BLOCK_GAS_LIMIT", 8, length));
     headers.add(new ColumnHeader("blockdata.COINBASE_HI", 4, length));
     headers.add(new ColumnHeader("blockdata.COINBASE_LO", 16, length));
     headers.add(new ColumnHeader("blockdata.CT", 1, length));
@@ -98,7 +98,7 @@ static List<ColumnHeader> headers(int length) {
     headers.add(new ColumnHeader("blockdata.IS_GASLIMIT", 1, length));
     headers.add(new ColumnHeader("blockdata.IS_NUMBER", 1, length));
     headers.add(new ColumnHeader("blockdata.IS_TIMESTAMP", 1, length));
-    headers.add(new ColumnHeader("blockdata.REL_BLOCK", 1, length));
+    headers.add(new ColumnHeader("blockdata.REL_BLOCK", 2, length));
     headers.add(new ColumnHeader("blockdata.REL_TX_NUM_MAX", 2, length));
     headers.add(new ColumnHeader("blockdata.RES", 16, length));
     headers.add(new ColumnHeader("blockdata.WCP_FLAG", 1, length));
@@ -248,42 +248,54 @@ public Trace arg2Lo(final Bytes b) {
     return this;
   }
 
-  public Trace basefee(final long b) {
+  public Trace basefee(final Bytes b) {
     if (filled.get(4)) {
       throw new IllegalStateException("blockdata.BASEFEE already set");
     } else {
       filled.set(4);
     }
 
-    if (b >= 281474976710656L) {
-      throw new IllegalArgumentException("blockdata.BASEFEE has invalid value (" + b + ")");
+    // Trim array to size
+    Bytes bs = b.trimLeadingZeros();
+    // Sanity check against expected width
+    if (bs.bitLength() > 64) {
+      throw new IllegalArgumentException(
+          "blockdata.BASEFEE has invalid width (" + bs.bitLength() + "bits)");
+    }
+    // Write padding (if necessary)
+    for (int i = bs.size(); i < 8; i++) {
+      basefee.put((byte) 0);
+    }
+    // Write bytes
+    for (int j = 0; j < bs.size(); j++) {
+      basefee.put(bs.get(j));
     }
-    basefee.put((byte) (b >> 40));
-    basefee.put((byte) (b >> 32));
-    basefee.put((byte) (b >> 24));
-    basefee.put((byte) (b >> 16));
-    basefee.put((byte) (b >> 8));
-    basefee.put((byte) b);
 
     return this;
   }
 
-  public Trace blockGasLimit(final long b) {
+  public Trace blockGasLimit(final Bytes b) {
     if (filled.get(5)) {
       throw new IllegalStateException("blockdata.BLOCK_GAS_LIMIT already set");
     } else {
       filled.set(5);
     }
 
-    if (b >= 281474976710656L) {
-      throw new IllegalArgumentException("blockdata.BLOCK_GAS_LIMIT has invalid value (" + b + ")");
+    // Trim array to size
+    Bytes bs = b.trimLeadingZeros();
+    // Sanity check against expected width
+    if (bs.bitLength() > 64) {
+      throw new IllegalArgumentException(
+          "blockdata.BLOCK_GAS_LIMIT has invalid width (" + bs.bitLength() + "bits)");
+    }
+    // Write padding (if necessary)
+    for (int i = bs.size(); i < 8; i++) {
+      blockGasLimit.put((byte) 0);
+    }
+    // Write bytes
+    for (int j = 0; j < bs.size(); j++) {
+      blockGasLimit.put(bs.get(j));
     }
-    blockGasLimit.put((byte) (b >> 40));
-    blockGasLimit.put((byte) (b >> 32));
-    blockGasLimit.put((byte) (b >> 24));
-    blockGasLimit.put((byte) (b >> 16));
-    blockGasLimit.put((byte) (b >> 8));
-    blockGasLimit.put((byte) b);
 
     return this;
   }
@@ -574,9 +586,10 @@ public Trace relBlock(final long b) {
       filled.set(24);
     }
 
-    if (b >= 256L) {
+    if (b >= 65536L) {
       throw new IllegalArgumentException("blockdata.REL_BLOCK has invalid value (" + b + ")");
     }
+    relBlock.put((byte) (b >> 8));
     relBlock.put((byte) b);
 
     return this;
@@ -589,7 +602,7 @@ public Trace relTxNumMax(final long b) {
       filled.set(25);
     }
 
-    if (b >= 1024L) {
+    if (b >= 65536L) {
       throw new IllegalArgumentException("blockdata.REL_TX_NUM_MAX has invalid value (" + b + ")");
     }
     relTxNumMax.put((byte) (b >> 8));
@@ -773,11 +786,11 @@ public Trace fillAndValidateRow() {
     }
 
     if (!filled.get(4)) {
-      basefee.position(basefee.position() + 6);
+      basefee.position(basefee.position() + 8);
     }
 
     if (!filled.get(5)) {
-      blockGasLimit.position(blockGasLimit.position() + 6);
+      blockGasLimit.position(blockGasLimit.position() + 8);
     }
 
     if (!filled.get(6)) {
@@ -853,7 +866,7 @@ public Trace fillAndValidateRow() {
     }
 
     if (!filled.get(24)) {
-      relBlock.position(relBlock.position() + 1);
+      relBlock.position(relBlock.position() + 2);
     }
 
     if (!filled.get(25)) {

arithmetization/src/main/java/net/consensys/linea/zktracer/module/constants/Trace.java

@@ -45,6 +45,8 @@ public class Trace {
       new BigInteger("302652579918965577886386472538583578916");
   public static final BigInteger EMPTY_SHA2_LO =
       new BigInteger("52744687940778649747319168982913824853");
+  public static final long ETHEREUM_GAS_LIMIT_MAXIMUM = 0xffffffffffffffffL;
+  public static final int ETHEREUM_GAS_LIMIT_MINIMUM = 0x1388;
   public static final int EVM_INST_ADD = 0x1;
   public static final int EVM_INST_ADDMOD = 0x8;
   public static final int EVM_INST_ADDRESS = 0x30;

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

@@ -202,7 +202,7 @@ public int lineCount() {
   private final RlpTxn rlpTxn = new RlpTxn(romLex);
   private final Mmio mmio;
 
-  private final TxnData txnData = new TxnData(wcp, euc);
+  private final TxnData txnData = new TxnData(this, wcp, euc);
   private final RlpTxnRcpt rlpTxnRcpt = new RlpTxnRcpt();
   private final LogInfo logInfo = new LogInfo(rlpTxnRcpt);
   private final LogData logData = new LogData(rlpTxnRcpt);
@@ -294,6 +294,9 @@ private List<Module> precompileLimitModules() {
    */
   public boolean failureConditionForCreates = false;
 
+  public Address coinbaseAddress;
+  public boolean coinbaseWarmthAtTransactionEnd = false;
+
   /**
    * @return a list of all modules for which to generate traces
    */
@@ -496,6 +499,7 @@ public void traceStartTransaction(final WorldView world, final Transaction tx) {
 
     if (!transactionProcessingMetadata.requiresEvmExecution()) {
       state.setProcessingPhase(TX_SKIP);
+      Address coinbaseAddress = Address.fromHexString("8f81e2e3f8b46467523463835f965ffe476e1c9e");
       new TxSkipSection(this, world, transactionProcessingMetadata, transients);
     } else {
       if (transactionProcessingMetadata.requiresPrewarming()) {
@@ -516,6 +520,8 @@ public void traceStartTransaction(final WorldView world, final Transaction tx) {
     }
   }
 
+  // the sender already received its gas refund
+  // the coinbase already received its gas reward
   public void traceEndTransaction(
       WorldView world,
       Transaction tx,
@@ -529,7 +535,7 @@ public void traceEndTransaction(
 
     txStack.current().completeLineaTransaction(this, isSuccessful, logs, selfDestructs);
 
-    defers.resolvePostTransaction(this, world, tx, isSuccessful);
+    defers.resolveAtEndTransaction(this, world, tx, isSuccessful);
 
     // Warn: we need to call MMIO after resolving the defers
     for (Module m : modules) {
@@ -546,6 +552,11 @@ public void traceContextEnter(MessageFrame frame) {
 
     // root and transaction call data context's
     if (frame.getDepth() == 0) {
+      coinbaseAddress = frame.getMiningBeneficiary();
+      if (state.getProcessingPhase() == TX_SKIP) {
+        checkState(currentTraceSection() instanceof TxSkipSection);
+        ((TxSkipSection) currentTraceSection()).coinbaseSnapshots(this, frame);
+      }
       final TransactionProcessingMetadata currentTransaction = transients().tx();
       final Address recipientAddress = frame.getRecipientAddress();
       final Address senderAddress = frame.getSenderAddress();
@@ -633,12 +644,12 @@ public void traceContextEnter(MessageFrame frame) {
 
       this.currentFrame().initializeFrame(frame);
 
-      defers.resolveUponContextEntry(this, frame);
-
       for (Module m : modules) {
         m.traceContextEnter(frame);
       }
     }
+
+    defers.resolveUponContextEntry(this, frame);
   }
 
   @Override
@@ -651,14 +662,13 @@ public void traceContextExit(MessageFrame frame) {
     if (frame.getDepth() == 0) {
       final long leftOverGas = frame.getRemainingGas();
       final long gasRefund = frame.getGasRefund();
-      final boolean coinbaseIsWarm = frame.isAddressWarm(txStack.current().getCoinbase());
 
       txStack
           .current()
           .setPreFinalisationValues(
               leftOverGas,
               gasRefund,
-              coinbaseIsWarm,
+              coinbaseWarmthAtTransactionEnd,
               txStack.getAccumulativeGasUsedInBlockBeforeTxStart());
 
       if (state.getProcessingPhase() != TX_SKIP
@@ -735,6 +745,7 @@ public void tracePostExecution(MessageFrame frame, Operation.OperationResult ope
 
     if (frame.getDepth() == 0 && (isExceptional() || opCode() == REVERT)) {
       this.state.setProcessingPhase(TX_FINL);
+      coinbaseWarmthAtTransactionEnd = frame.isAddressWarm(coinbaseAddress);
       new TxFinalizationSection(this, frame.getWorldUpdater(), true);
     }
   }