Feat/issue 944/implement txn data update handling the max nonce

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

@@ -26,12 +26,13 @@
 public class GlobalConstants {
   public static final int BLOCKHASH_MAX_HISTORY = 0x100;
   public static final int CREATE2_SHIFT = 0xff;
+  public static final long EIP2681_MAX_NONCE = 0xffffffffffffffffL;
   public static final int EIP_3541_MARKER = 0xef;
   public static final BigInteger EMPTY_KECCAK_HI =
       new BigInteger("262949717399590921288928019264691438528");
   public static final BigInteger EMPTY_KECCAK_LO =
       new BigInteger("304396909071904405792975023732328604784");
-  public static final long EMPTY_RIPEMD_HI = 0x9c1185a5L;
+  public static final int EMPTY_RIPEMD_HI = 0x9c1185a5;
   public static final BigInteger EMPTY_RIPEMD_LO =
       new BigInteger("263072838190121256777638892741499129137");
   public static final BigInteger EMPTY_SHA2_HI =

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

@@ -39,6 +39,7 @@ public class Trace {
   public static final int COMMON_RLP_TXN_PHASE_NUMBER_4 = 0xa;
   public static final int COMMON_RLP_TXN_PHASE_NUMBER_5 = 0x7;
   public static final int CREATE2_SHIFT = 0xff;
+  public static final long EIP2681_MAX_NONCE = 0xffffffffffffffffL;
   public static final int EIP_3541_MARKER = 0xef;
   public static final BigInteger EMPTY_KECCAK_HI =
       new BigInteger("262949717399590921288928019264691438528");
@@ -287,9 +288,9 @@ public class Trace {
   public static final int MMU_INST_RAM_TO_EXO_WITH_PADDING = 0xfe20;
   public static final int MMU_INST_RAM_TO_RAM_SANS_PADDING = 0xfe40;
   public static final int MMU_INST_RIGHT_PADDED_WORD_EXTRACTION = 0xfe10;
-  public static final int NB_ROWS_TYPE_0 = 0x7;
-  public static final int NB_ROWS_TYPE_1 = 0x8;
-  public static final int NB_ROWS_TYPE_2 = 0x8;
+  public static final int NB_ROWS_TYPE_0 = 0x8;
+  public static final int NB_ROWS_TYPE_1 = 0x9;
+  public static final int NB_ROWS_TYPE_2 = 0x9;
   public static final int OOB_INST_BLAKE_CDS = 0xfa09;
   public static final int OOB_INST_BLAKE_PARAMS = 0xfb09;
   public static final int OOB_INST_CALL = 0xca;
@@ -375,6 +376,15 @@ public class Trace {
   public static final int WCP_INST_LEQ = 0xf;
   public static final int WORD_SIZE = 0x20;
   public static final int WORD_SIZE_MO = 0x1f;
+  public static final int comparaison___computing_effective_gas_price_row_offset = 0x8;
+  public static final int comparaison___detecting_empty_call_data_row_offset = 0x5;
+  public static final int comparaison___effective_refund_row_offset = 0x4;
+  public static final int comparaison___initial_balance_row_offset = 0x1;
+  public static final int comparaison___max_fee_and_basefee_row_offset = 0x6;
+  public static final int comparaison___maxfee_and_max_priority_fee_row_offset = 0x7;
+  public static final int comparaison___nonce_row_offset = 0x0;
+  public static final int comparaison___sufficient_gas_row_offset = 0x2;
+  public static final int comparaison___upper_limit_refunds_row_offset = 0x3;
 
   private final BitSet filled = new BitSet();
   private int currentLine = 0;

arithmetization/src/main/java/net/consensys/linea/zktracer/module/txndata/TxndataOperation.java

@@ -22,6 +22,7 @@
 import static net.consensys.linea.zktracer.module.txndata.Trace.COMMON_RLP_TXN_PHASE_NUMBER_3;
 import static net.consensys.linea.zktracer.module.txndata.Trace.COMMON_RLP_TXN_PHASE_NUMBER_4;
 import static net.consensys.linea.zktracer.module.txndata.Trace.COMMON_RLP_TXN_PHASE_NUMBER_5;
+import static net.consensys.linea.zktracer.module.txndata.Trace.EIP2681_MAX_NONCE;
 import static net.consensys.linea.zktracer.module.txndata.Trace.MAX_REFUND_QUOTIENT;
 import static net.consensys.linea.zktracer.module.txndata.Trace.NB_ROWS_TYPE_0;
 import static net.consensys.linea.zktracer.module.txndata.Trace.NB_ROWS_TYPE_1;
@@ -57,8 +58,10 @@ public class TxndataOperation extends ModuleOperation {
   private final Euc euc;
   @Getter public final TransactionProcessingMetadata tx;
 
+  private static final Bytes EIP_2681_MAX_NONCE = Bytes.minimalBytes(EIP2681_MAX_NONCE);
   private static final int N_ROWS_TX_MAX =
       Math.max(Math.max(NB_ROWS_TYPE_0, NB_ROWS_TYPE_1), NB_ROWS_TYPE_2);
+  private static final int NB_WCP_EUC_ROWS_FRONTIER_ACCESS_LIST = 6;
   private final List<TxnDataComparisonRecord> callsToEucAndWcp = new ArrayList<>(N_ROWS_TX_MAX);
   private final ArrayList<RlptxnOutgoing> valuesToRlptxn = new ArrayList<>(N_ROWS_TX_MAX);
   private final ArrayList<RlptxrcptOutgoing> valuesToRlpTxrcpt = new ArrayList<>(N_ROWS_TX_MAX);
@@ -72,68 +75,73 @@ public TxndataOperation(Wcp wcp, Euc euc, TransactionProcessingMetadata tx) {
   }
 
   private void setCallsToEucAndWcp() {
-    // i+0
-    final Bytes row0arg1 = bigIntegerToBytes(tx.getInitialBalance());
+    // i + nonce_row_offset
+    final Bytes nonce = Bytes.minimalBytes(tx.getBesuTransaction().getNonce());
+    wcp.callLT(nonce, EIP_2681_MAX_NONCE);
+    callsToEucAndWcp.add(TxnDataComparisonRecord.callToLt(nonce, EIP_2681_MAX_NONCE, true));
+
+    // i + initial_balance_row_offset
+    final Bytes initBalance = bigIntegerToBytes(tx.getInitialBalance());
     final BigInteger value = tx.getBesuTransaction().getValue().getAsBigInteger();
     final Bytes row0arg2 =
         bigIntegerToBytes(
             value.add(
                 outgoingLowRow6()
                     .multiply(BigInteger.valueOf(tx.getBesuTransaction().getGasLimit()))));
-    wcp.callLT(row0arg1, row0arg2);
-    this.callsToEucAndWcp.add(TxnDataComparisonRecord.callToLt(row0arg1, row0arg2, false));
+    wcp.callLT(initBalance, row0arg2);
+    callsToEucAndWcp.add(TxnDataComparisonRecord.callToLt(initBalance, row0arg2, false));
 
-    // i+1
+    // i + sufficient_gas_row_offset
     final Bytes row1arg1 = Bytes.minimalBytes(tx.getBesuTransaction().getGasLimit());
     final Bytes row1arg2 = Bytes.minimalBytes(tx.getUpfrontGasCost());
     wcp.callLT(row1arg1, row1arg2);
-    this.callsToEucAndWcp.add(TxnDataComparisonRecord.callToLt(row1arg1, row1arg2, false));
+    callsToEucAndWcp.add(TxnDataComparisonRecord.callToLt(row1arg1, row1arg2, false));
 
-    // i+2
+    // i + upper_limit_refunds_row_offset
     final Bytes row2arg1 =
         Bytes.minimalBytes(tx.getBesuTransaction().getGasLimit() - tx.getLeftoverGas());
     final Bytes row2arg2 = Bytes.of(MAX_REFUND_QUOTIENT);
     final Bytes refundLimit = euc.callEUC(row2arg1, row2arg2).quotient();
-    this.callsToEucAndWcp.add(TxnDataComparisonRecord.callToEuc(row2arg1, row2arg2, refundLimit));
+    callsToEucAndWcp.add(TxnDataComparisonRecord.callToEuc(row2arg1, row2arg2, refundLimit));
 
-    // i+3
+    // i + effective_refund_row_offset
     final Bytes refundCounterMax = Bytes.minimalBytes(tx.getRefundCounterMax());
     final boolean getFullRefund = wcp.callLT(refundCounterMax, refundLimit);
-    this.callsToEucAndWcp.add(
+    callsToEucAndWcp.add(
         TxnDataComparisonRecord.callToLt(refundCounterMax, refundLimit, getFullRefund));
 
-    // i+4
+    // i + detecting_empty_call_data_row_offset
     final Bytes row4arg1 = Bytes.minimalBytes(tx.getBesuTransaction().getPayload().size());
     final boolean nonZeroDataSize = wcp.callISZERO(row4arg1);
-    this.callsToEucAndWcp.add(TxnDataComparisonRecord.callToIsZero(row4arg1, nonZeroDataSize));
+    callsToEucAndWcp.add(TxnDataComparisonRecord.callToIsZero(row4arg1, nonZeroDataSize));
 
     switch (tx.getBesuTransaction().getType()) {
       case FRONTIER -> {
-        for (int i = 5; i < NB_ROWS_TYPE_0; i++) {
-          this.callsToEucAndWcp.add(TxnDataComparisonRecord.empty());
+        for (int i = NB_WCP_EUC_ROWS_FRONTIER_ACCESS_LIST; i < NB_ROWS_TYPE_0; i++) {
+          callsToEucAndWcp.add(TxnDataComparisonRecord.empty());
         }
       }
       case ACCESS_LIST -> {
-        for (int i = 5; i < NB_ROWS_TYPE_1; i++) {
-          this.callsToEucAndWcp.add(TxnDataComparisonRecord.empty());
+        for (int i = NB_WCP_EUC_ROWS_FRONTIER_ACCESS_LIST; i < NB_ROWS_TYPE_1; i++) {
+          callsToEucAndWcp.add(TxnDataComparisonRecord.empty());
         }
       }
       case EIP1559 -> {
-        // i+5
+        // i + max_fee_and_basefee_row_offset
         final Bytes maxFee =
             bigIntegerToBytes(tx.getBesuTransaction().getMaxFeePerGas().get().getAsBigInteger());
         final Bytes row5arg2 = Bytes.minimalBytes(tx.getBaseFee());
         wcp.callLT(maxFee, row5arg2);
-        this.callsToEucAndWcp.add(TxnDataComparisonRecord.callToLt(maxFee, row5arg2, false));
+        callsToEucAndWcp.add(TxnDataComparisonRecord.callToLt(maxFee, row5arg2, false));
 
-        // i+6
+        // i + maxfee_and_max_priority_fee_row_offset
         final Bytes row6arg2 =
             bigIntegerToBytes(
                 tx.getBesuTransaction().getMaxPriorityFeePerGas().get().getAsBigInteger());
         wcp.callLT(maxFee, row6arg2);
-        this.callsToEucAndWcp.add(TxnDataComparisonRecord.callToLt(maxFee, row6arg2, false));
+        callsToEucAndWcp.add(TxnDataComparisonRecord.callToLt(maxFee, row6arg2, false));
 
-        // i+7
+        // i + computing_effective_gas_price_row_offset
         final Bytes row7arg2 =
             bigIntegerToBytes(
                 tx.getBesuTransaction()
@@ -142,7 +150,7 @@ private void setCallsToEucAndWcp() {
                     .getAsBigInteger()
                     .add(BigInteger.valueOf(tx.getBaseFee())));
         final boolean result = wcp.callLT(maxFee, row7arg2);
-        this.callsToEucAndWcp.add(TxnDataComparisonRecord.callToLt(maxFee, row7arg2, result));
+        callsToEucAndWcp.add(TxnDataComparisonRecord.callToLt(maxFee, row7arg2, result));
       }
     }
   }
@@ -161,41 +169,41 @@ protected int computeLineCount() {
 
   private void setRlptxnValues() {
     // i+0
-    this.valuesToRlptxn.add(
+    valuesToRlptxn.add(
         RlptxnOutgoing.set(
             (short) COMMON_RLP_TXN_PHASE_NUMBER_0,
             Bytes.EMPTY,
             Bytes.ofUnsignedInt(getTxTypeAsInt(tx.getBesuTransaction().getType()))));
     // i+1
-    this.valuesToRlptxn.add(
+    valuesToRlptxn.add(
         RlptxnOutgoing.set(
             (short) COMMON_RLP_TXN_PHASE_NUMBER_1,
             tx.isDeployment() ? Bytes.EMPTY : tx.getEffectiveTo().slice(0, 4),
             tx.isDeployment() ? Bytes.EMPTY : lowPart(tx.getEffectiveTo())));
 
     // i+2
-    this.valuesToRlptxn.add(
+    valuesToRlptxn.add(
         RlptxnOutgoing.set(
             (short) COMMON_RLP_TXN_PHASE_NUMBER_2,
             Bytes.EMPTY,
             Bytes.ofUnsignedLong(tx.getBesuTransaction().getNonce())));
 
     // i+3
-    this.valuesToRlptxn.add(
+    valuesToRlptxn.add(
         RlptxnOutgoing.set(
             (short) COMMON_RLP_TXN_PHASE_NUMBER_3,
             tx.isDeployment() ? Bytes.of(1) : Bytes.EMPTY,
             bigIntegerToBytes(tx.getBesuTransaction().getValue().getAsBigInteger())));
 
     // i+4
-    this.valuesToRlptxn.add(
+    valuesToRlptxn.add(
         RlptxnOutgoing.set(
             (short) COMMON_RLP_TXN_PHASE_NUMBER_4,
             Bytes.ofUnsignedLong(tx.getDataCost()),
             Bytes.ofUnsignedLong(tx.getBesuTransaction().getPayload().size())));
 
     // i+5
-    this.valuesToRlptxn.add(
+    valuesToRlptxn.add(
         RlptxnOutgoing.set(
             (short) COMMON_RLP_TXN_PHASE_NUMBER_5,
             Bytes.EMPTY,
@@ -204,53 +212,53 @@ private void setRlptxnValues() {
     switch (tx.getBesuTransaction().getType()) {
       case FRONTIER -> {
         // i+6
-        this.valuesToRlptxn.add(
+        valuesToRlptxn.add(
             RlptxnOutgoing.set(
                 (short) TYPE_0_RLP_TXN_PHASE_NUMBER_6,
                 Bytes.EMPTY,
                 Bytes.minimalBytes(tx.getEffectiveGasPrice())));
         for (int i = 7; i < NB_ROWS_TYPE_0 + 1; i++) {
-          this.valuesToRlptxn.add(RlptxnOutgoing.empty());
+          valuesToRlptxn.add(RlptxnOutgoing.empty());
         }
       }
       case ACCESS_LIST -> {
         // i+6
-        this.valuesToRlptxn.add(
+        valuesToRlptxn.add(
             RlptxnOutgoing.set(
                 (short) TYPE_1_RLP_TXN_PHASE_NUMBER_6,
                 Bytes.EMPTY,
                 Bytes.minimalBytes(tx.getEffectiveGasPrice())));
 
         // i+7
-        this.valuesToRlptxn.add(
+        valuesToRlptxn.add(
             RlptxnOutgoing.set(
                 (short) TYPE_1_RLP_TXN_PHASE_NUMBER_7,
                 Bytes.ofUnsignedInt(tx.numberWarmedKey()),
                 Bytes.ofUnsignedInt(tx.numberWarmedAddress())));
 
         for (int i = 8; i < NB_ROWS_TYPE_1 + 1; i++) {
-          this.valuesToRlptxn.add(RlptxnOutgoing.empty());
+          valuesToRlptxn.add(RlptxnOutgoing.empty());
         }
       }
 
       case EIP1559 -> {
         // i+6
-        this.valuesToRlptxn.add(
+        valuesToRlptxn.add(
             RlptxnOutgoing.set(
                 (short) TYPE_2_RLP_TXN_PHASE_NUMBER_6,
                 bigIntegerToBytes(
                     tx.getBesuTransaction().getMaxPriorityFeePerGas().get().getAsBigInteger()),
                 bigIntegerToBytes(outgoingLowRow6())));
 
         // i+7
-        this.valuesToRlptxn.add(
+        valuesToRlptxn.add(
             RlptxnOutgoing.set(
                 (short) TYPE_2_RLP_TXN_PHASE_NUMBER_7,
                 Bytes.ofUnsignedInt(tx.numberWarmedKey()),
                 Bytes.ofUnsignedInt(tx.numberWarmedAddress())));
 
         for (int i = 8; i < NB_ROWS_TYPE_2 + 1; i++) {
-          this.valuesToRlptxn.add(RlptxnOutgoing.empty());
+          valuesToRlptxn.add(RlptxnOutgoing.empty());
         }
       }
     }
@@ -277,8 +285,8 @@ public void setRlptxrcptValues() {
 
   public void setCallWcpLastTxOfBlock(final Bytes blockGasLimit) {
     final Bytes arg1 = Bytes.minimalBytes(tx.getAccumulatedGasUsedInBlock());
-    this.wcp.callLEQ(arg1, blockGasLimit);
-    this.callsToEucAndWcp.add(TxnDataComparisonRecord.callToLeq(arg1, blockGasLimit, true));
+    wcp.callLEQ(arg1, blockGasLimit);
+    callsToEucAndWcp.add(TxnDataComparisonRecord.callToLeq(arg1, blockGasLimit, true));
   }
 
   private BigInteger outgoingLowRow6() {
@@ -298,8 +306,8 @@ public void traceTx(Trace trace, BlockSnapshot block, int absTxNumMax) {
     final boolean isLastTxOfTheBlock =
         tx.getRelativeTransactionNumber() == block.getNbOfTxsInBlock();
     if (isLastTxOfTheBlock) {
-      this.valuesToRlptxn.add(RlptxnOutgoing.empty());
-      this.valuesToRlpTxrcpt.add(RlptxrcptOutgoing.emptyValue());
+      valuesToRlptxn.add(RlptxnOutgoing.empty());
+      valuesToRlpTxrcpt.add(RlptxrcptOutgoing.emptyValue());
     }
 
     final long fromHi = highPart(tx.getSender());
@@ -363,17 +371,17 @@ public void traceTx(Trace trace, BlockSnapshot block, int absTxNumMax) {
           .gasCumulative(cumulativeGas)
           .statusCode(tx.statusCode())
           .codeFragmentIndex(tx.getCodeFragmentIndex())
-          .phaseRlpTxn(UnsignedByte.of(this.valuesToRlptxn.get(ct).phase()))
-          .outgoingHi(this.valuesToRlptxn.get(ct).outGoingHi())
-          .outgoingLo(this.valuesToRlptxn.get(ct).outGoingLo())
-          .eucFlag(this.callsToEucAndWcp.get(ct).eucFlag())
-          .wcpFlag(this.callsToEucAndWcp.get(ct).wcpFlag())
-          .inst(UnsignedByte.of(this.callsToEucAndWcp.get(ct).instruction()))
-          .argOneLo(this.callsToEucAndWcp.get(ct).arg1())
-          .argTwoLo(this.callsToEucAndWcp.get(ct).arg2())
-          .res(this.callsToEucAndWcp.get(ct).result())
-          .phaseRlpTxnrcpt(UnsignedByte.of(this.valuesToRlpTxrcpt.get(ct).phase()))
-          .outgoingRlpTxnrcpt(Bytes.ofUnsignedLong(this.valuesToRlpTxrcpt.get(ct).outgoing()))
+          .phaseRlpTxn(UnsignedByte.of(valuesToRlptxn.get(ct).phase()))
+          .outgoingHi(valuesToRlptxn.get(ct).outGoingHi())
+          .outgoingLo(valuesToRlptxn.get(ct).outGoingLo())
+          .eucFlag(callsToEucAndWcp.get(ct).eucFlag())
+          .wcpFlag(callsToEucAndWcp.get(ct).wcpFlag())
+          .inst(UnsignedByte.of(callsToEucAndWcp.get(ct).instruction()))
+          .argOneLo(callsToEucAndWcp.get(ct).arg1())
+          .argTwoLo(callsToEucAndWcp.get(ct).arg2())
+          .res(callsToEucAndWcp.get(ct).result())
+          .phaseRlpTxnrcpt(UnsignedByte.of(valuesToRlpTxrcpt.get(ct).phase()))
+          .outgoingRlpTxnrcpt(Bytes.ofUnsignedLong(valuesToRlpTxrcpt.get(ct).outgoing()))
           .validateRow();
     }
   }

arithmetization/src/main/java/net/consensys/linea/zktracer/types/TransactionProcessingMetadata.java

@@ -146,10 +146,11 @@ public TransactionProcessingMetadata(
 
     this.initialBalance = getInitialBalance(world);
 
-    // Note: Besu's dataCost computation contains the 21_000 transaction cost
+    // Note: Besu's dataCost computation contains
+    // - the 21_000 transaction cost (we deduce it)
+    // - the contract creation cost in case of deployment (we set deployment to false to not add it)
     this.dataCost =
-        ZkTracer.gasCalculator.transactionIntrinsicGasCost(
-                besuTransaction.getPayload(), isDeployment)
+        ZkTracer.gasCalculator.transactionIntrinsicGasCost(besuTransaction.getPayload(), false)
             - GAS_CONST_G_TRANSACTION;
     this.accessListCost =
         besuTransaction.getAccessList().map(ZkTracer.gasCalculator::accessListGasCost).orElse(0L);

gradle/trace-files.gradle

@@ -98,7 +98,7 @@ tasks.register('binreftable', TraceFilesTask) {
 ['txndata'].each {moduleName ->
     tasks.register(moduleName, TraceFilesTask) {
         group "Trace files generation"
-        dependsOn corsetExists
+        // dependsOn corsetExists
 
         module = moduleName
         files = ["${moduleName}/columns.lisp", "constants/constants.lisp", "${moduleName}/constants.lisp"]