EIP-3651-warm-coinbase

arithmetization/src/main/java/net/consensys/linea/corset/GoCorsetValidator.java

@@ -15,7 +15,7 @@
 
 package net.consensys.linea.corset;
 
-import static net.consensys.linea.zktracer.ChainConfig.MAINNET_TESTCONFIG;
+import static net.consensys.linea.zktracer.ChainConfig.MAINNET_LONDON_TESTCONFIG;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -154,7 +154,7 @@ private List<String> buildCommandLine(Path traceFile, String zkEvmBin) {
    * @param options
    */
   private void setChainConstants(List<String> options) {
-    if (chain != MAINNET_TESTCONFIG) {
+    if (chain != MAINNET_LONDON_TESTCONFIG) {
       options.add("-Sblockdata.GAS_LIMIT_MINIMUM=" + chain.gasLimitMinimum.toString());
       options.add("-Sblockdata.GAS_LIMIT_MAXIMUM=" + chain.gasLimitMaximum.toString());
       if (chain.fixedGasLimitEnabled) {

arithmetization/src/main/java/net/consensys/linea/plugins/AbstractLineaSharedOptionsPlugin.java

@@ -15,11 +15,14 @@
 
 package net.consensys.linea.plugins;
 
+import static net.consensys.linea.zktracer.Fork.LONDON;
+
 import java.util.Map;
 
 import lombok.extern.slf4j.Slf4j;
 import net.consensys.linea.plugins.config.LineaL1L2BridgeSharedCliOptions;
 import net.consensys.linea.plugins.config.LineaL1L2BridgeSharedConfiguration;
+import net.consensys.linea.zktracer.Fork;
 
 /** In this class we put CLI options that are shared with other plugins not defined here */
 @Slf4j
@@ -45,6 +48,10 @@ public LineaL1L2BridgeSharedConfiguration l1L2BridgeSharedConfiguration() {
     return l2L1;
   }
 
+  public Fork fork() {
+    return LONDON; // TODO: IMPORTANT
+  }
+
   @Override
   public void start() {
     super.start();

arithmetization/src/main/java/net/consensys/linea/plugins/rpc/batchlinecount/ConflatedCountTracesV2.java

@@ -27,6 +27,7 @@
 import net.consensys.linea.plugins.rpc.RequestLimiter;
 import net.consensys.linea.plugins.rpc.Validator;
 import net.consensys.linea.plugins.rpc.tracegeneration.TraceRequestParams;
+import net.consensys.linea.zktracer.Fork;
 import net.consensys.linea.zktracer.ZkTracer;
 import net.consensys.linea.zktracer.json.JsonConverter;
 import org.hyperledger.besu.plugin.ServiceManager;
@@ -48,6 +49,7 @@ public class ConflatedCountTracesV2 {
   private final ServiceManager besuContext;
   private final LineaL1L2BridgeSharedConfiguration l1L2BridgeSharedConfiguration;
   private TraceService traceService;
+  private Fork fork;
 
   public String getNamespace() {
     return "linea";
@@ -86,6 +88,7 @@ private ConflatedLineCounts countConflation(PluginRpcRequest request) {
     final long toBlock = params.endBlockNumber();
     final ZkTracer tracer =
         new ZkTracer(
+            fork,
             l1L2BridgeSharedConfiguration,
             BesuServiceProvider.getBesuService(besuContext, BlockchainService.class)
                 .getChainId()

arithmetization/src/main/java/net/consensys/linea/plugins/rpc/linecounts/GenerateLineCountsV2.java

@@ -27,6 +27,7 @@
 import net.consensys.linea.plugins.config.LineaL1L2BridgeSharedConfiguration;
 import net.consensys.linea.plugins.rpc.RequestLimiter;
 import net.consensys.linea.plugins.rpc.Validator;
+import net.consensys.linea.zktracer.Fork;
 import net.consensys.linea.zktracer.ZkTracer;
 import net.consensys.linea.zktracer.json.JsonConverter;
 import org.hyperledger.besu.plugin.ServiceManager;
@@ -43,8 +44,8 @@ public class GenerateLineCountsV2 {
   private static final Cache<Long, Map<String, Integer>> CACHE =
       CacheBuilder.newBuilder().maximumSize(CACHE_SIZE).build();
 
+  private final Fork fork;
   private final RequestLimiter requestLimiter;
-
   private final ServiceManager besuContext;
   private TraceService traceService;
   private final LineaL1L2BridgeSharedConfiguration l1L2BridgeSharedConfiguration;
@@ -99,6 +100,7 @@ private LineCounts getLineCounts(PluginRpcRequest request) {
                     blockNumber -> {
                       final ZkTracer tracer =
                           new ZkTracer(
+                              fork,
                               l1L2BridgeSharedConfiguration,
                               BesuServiceProvider.getBesuService(
                                       besuContext, BlockchainService.class)

arithmetization/src/main/java/net/consensys/linea/plugins/rpc/tracegeneration/GenerateConflatedTracesV2.java

@@ -26,6 +26,7 @@
 import net.consensys.linea.plugins.rpc.RequestLimiter;
 import net.consensys.linea.plugins.rpc.Validator;
 import net.consensys.linea.tracewriter.TraceWriter;
+import net.consensys.linea.zktracer.Fork;
 import net.consensys.linea.zktracer.ZkTracer;
 import net.consensys.linea.zktracer.json.JsonConverter;
 import org.hyperledger.besu.plugin.ServiceManager;
@@ -49,16 +50,19 @@ public class GenerateConflatedTracesV2 {
   private final ServiceManager besuContext;
   private TraceService traceService;
   private final LineaL1L2BridgeSharedConfiguration l1L2BridgeSharedConfiguration;
+  private final Fork fork;
 
   public GenerateConflatedTracesV2(
       final ServiceManager besuContext,
       final RequestLimiter requestLimiter,
       final TracesEndpointConfiguration endpointConfiguration,
-      LineaL1L2BridgeSharedConfiguration lineaL1L2BridgeSharedConfiguration) {
+      final LineaL1L2BridgeSharedConfiguration lineaL1L2BridgeSharedConfiguration,
+      final Fork fork) {
     this.besuContext = besuContext;
     this.requestLimiter = requestLimiter;
     this.tracesOutputPath = Paths.get(endpointConfiguration.tracesOutputPath());
     this.l1L2BridgeSharedConfiguration = lineaL1L2BridgeSharedConfiguration;
+    this.fork = fork;
   }
 
   public String getNamespace() {
@@ -98,6 +102,7 @@ private TraceFile generateTraceFile(PluginRpcRequest request) {
     final long toBlock = params.endBlockNumber();
     final ZkTracer tracer =
         new ZkTracer(
+            fork,
             l1L2BridgeSharedConfiguration,
             BesuServiceProvider.getBesuService(besuContext, BlockchainService.class)
                 .getChainId()

arithmetization/src/main/java/net/consensys/linea/zktracer/ChainConfig.java

@@ -14,6 +14,7 @@
  */
 package net.consensys.linea.zktracer;
 
+import static net.consensys.linea.zktracer.Fork.LONDON;
 import static net.consensys.linea.zktracer.Trace.ETHEREUM_GAS_LIMIT_MAXIMUM;
 import static net.consensys.linea.zktracer.Trace.ETHEREUM_GAS_LIMIT_MINIMUM;
 import static net.consensys.linea.zktracer.Trace.LINEA_CHAIN_ID;
@@ -34,17 +35,19 @@ public class ChainConfig {
    * Represents Linea mainnet as it stands today which enforces the block gas limit (currently two
    * billion). As the name suggest, this is only intended for testing purposes.
    */
-  public static final ChainConfig MAINNET_TESTCONFIG =
+  public static final ChainConfig MAINNET_LONDON_TESTCONFIG =
       new ChainConfig(
+          LONDON,
           LINEA_CHAIN_ID,
           true,
           BigInteger.valueOf(LINEA_GAS_LIMIT_MINIMUM),
           BigInteger.valueOf(LINEA_GAS_LIMIT_MAXIMUM),
           LineaL1L2BridgeSharedConfiguration.TEST_DEFAULT);
 
   /** Represents Ethereum mainnet for the purposes of running reference tests. */
-  public static final ChainConfig ETHEREUM =
+  public static final ChainConfig ETHEREUM_LONDON =
       new ChainConfig(
+          LONDON,
           1,
           false,
           BigInteger.valueOf(ETHEREUM_GAS_LIMIT_MINIMUM),
@@ -57,6 +60,7 @@ public class ChainConfig {
    */
   public static final ChainConfig OLD_MAINNET_TESTCONFIG =
       new ChainConfig(
+          LONDON,
           LINEA_CHAIN_ID,
           false,
           BigInteger.valueOf(LINEA_GAS_LIMIT_MINIMUM),
@@ -69,12 +73,15 @@ public class ChainConfig {
    */
   public static final ChainConfig OLD_SEPOLIA_TESTCONFIG =
       new ChainConfig(
+          LONDON,
           LINEA_SEPOLIA_CHAIN_ID,
           false,
           BigInteger.valueOf(LINEA_GAS_LIMIT_MINIMUM),
           BigInteger.valueOf(LINEA_GAS_LIMIT_MAXIMUM),
           LineaL1L2BridgeSharedConfiguration.TEST_DEFAULT);
 
+  public final Fork fork;
+
   /** ChainID for this chain */
   public final BigInteger id;
 
@@ -91,12 +98,14 @@ public class ChainConfig {
   public final LineaL1L2BridgeSharedConfiguration bridgeConfiguration;
 
   private ChainConfig(
+      Fork fork,
       int chainId,
       boolean gasLimitEnabled,
       BigInteger gasLimitMinimum,
       BigInteger gasLimitMaximum,
       LineaL1L2BridgeSharedConfiguration bridgeConfig) {
     this(
+        fork,
         BigInteger.valueOf(chainId),
         gasLimitEnabled,
         gasLimitMinimum,
@@ -105,16 +114,18 @@ private ChainConfig(
   }
 
   private ChainConfig(
+      Fork fork,
       BigInteger chainId,
       boolean fixedGasLimitEnabled,
       BigInteger gasLimitMinimum,
       BigInteger gasLimitMaximum,
       LineaL1L2BridgeSharedConfiguration bridgeConfig) {
-    // Sanity cehck chainId is non-negative.
+    // Sanity check chainId is non-negative.
     if (chainId.compareTo(BigInteger.ZERO) < 0) {
       throw new IllegalArgumentException("invalid chain id (" + chainId + ")");
     }
     //
+    this.fork = fork;
     this.id = chainId;
     this.fixedGasLimitEnabled = fixedGasLimitEnabled;
     this.gasLimitMinimum = gasLimitMinimum;
@@ -130,9 +141,21 @@ private ChainConfig(
    * @param chainId
    * @return
    */
-  public static ChainConfig LINEA_CHAIN(
+  public static ChainConfig LONDON_LINEA_CHAIN(
       LineaL1L2BridgeSharedConfiguration bridgeConfig, BigInteger chainId) {
     return new ChainConfig(
+        LONDON,
+        chainId,
+        true,
+        BigInteger.valueOf(LINEA_GAS_LIMIT_MINIMUM),
+        BigInteger.valueOf(LINEA_GAS_LIMIT_MAXIMUM),
+        bridgeConfig);
+  }
+
+  public static ChainConfig FORK_LINEA_CHAIN(
+      Fork fork, LineaL1L2BridgeSharedConfiguration bridgeConfig, BigInteger chainId) {
+    return new ChainConfig(
+        fork,
         chainId,
         true,
         BigInteger.valueOf(LINEA_GAS_LIMIT_MINIMUM),

arithmetization/src/main/java/net/consensys/linea/zktracer/Fork.java

@@ -0,0 +1,23 @@
+/*
+ * 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;
+
+public enum Fork {
+  LONDON,
+  SHANGHAI,
+  CANCUN,
+  PRAGUE;
+}

arithmetization/src/main/java/net/consensys/linea/zktracer/ZkTracer.java

@@ -14,7 +14,7 @@
  */
 package net.consensys.linea.zktracer;
 
-import static net.consensys.linea.zktracer.ChainConfig.LINEA_CHAIN;
+import static net.consensys.linea.zktracer.ChainConfig.FORK_LINEA_CHAIN;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
@@ -34,7 +34,7 @@
 import net.consensys.linea.zktracer.container.module.Module;
 import net.consensys.linea.zktracer.exceptions.TracingExceptions;
 import net.consensys.linea.zktracer.module.DebugMode;
-import net.consensys.linea.zktracer.module.hub.Hub;
+import net.consensys.linea.zktracer.module.hub.*;
 import net.consensys.linea.zktracer.runtime.callstack.CallFrame;
 import net.consensys.linea.zktracer.types.FiniteList;
 import org.apache.tuweni.bytes.Bytes;
@@ -73,8 +73,10 @@ public class ZkTracer implements ConflationAwareOperationTracer {
    * @param chainId Identifies the chain being traced.
    */
   public ZkTracer(
-      final LineaL1L2BridgeSharedConfiguration bridgeConfiguration, BigInteger chainId) {
-    this(LINEA_CHAIN(bridgeConfiguration, chainId));
+      final Fork fork,
+      final LineaL1L2BridgeSharedConfiguration bridgeConfiguration,
+      BigInteger chainId) {
+    this(FORK_LINEA_CHAIN(fork, bridgeConfiguration, chainId));
   }
 
   /**
@@ -85,7 +87,13 @@ public ZkTracer(
    */
   public ZkTracer(ChainConfig chain) {
     this.chain = chain;
-    this.hub = new Hub(chain);
+    this.hub =
+        switch (chain.fork) {
+          case LONDON -> new LondonHub(chain);
+          case SHANGHAI -> new ShanghaiHub(chain);
+          case CANCUN -> new CancunHub(chain);
+          case PRAGUE -> new PragueHub(chain);
+        };
     final DebugMode.PinLevel debugLevel = new DebugMode.PinLevel();
     this.debugMode =
         debugLevel.none() ? Optional.empty() : Optional.of(new DebugMode(debugLevel, this.hub));

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

@@ -27,7 +27,8 @@
 import net.consensys.linea.zktracer.Trace;
 import net.consensys.linea.zktracer.container.module.Module;
 import net.consensys.linea.zktracer.module.euc.Euc;
-import net.consensys.linea.zktracer.module.txndata.TxnData;
+import net.consensys.linea.zktracer.module.hub.Hub;
+import net.consensys.linea.zktracer.module.txndata.module.TxnData;
 import net.consensys.linea.zktracer.module.wcp.Wcp;
 import net.consensys.linea.zktracer.opcode.OpCode;
 import org.hyperledger.besu.evm.worldstate.WorldView;
@@ -36,9 +37,9 @@
 
 @RequiredArgsConstructor
 public class Blockdata implements Module {
+  private final Hub hub;
   private final Wcp wcp;
   private final Euc euc;
-  private final TxnData txnData;
   private final ChainConfig chain;
   @Getter private final List<BlockdataOperation> operations = new ArrayList<>();
   @Getter private long firstBlockNumber;
@@ -94,10 +95,10 @@ public void traceEndBlock(final BlockHeader blockHeader, final BlockBody blockBo
     for (OpCode opCode : opCodes) {
       final BlockdataOperation operation =
           new BlockdataOperation(
-              txnData.hub(),
+              hub,
               blockHeader,
               previousBlockHeader,
-              txnData.currentBlock().getNbOfTxsInBlock(),
+              txnData().currentBlock().getNbOfTxsInBlock(),
               wcp,
               euc,
               chain,
@@ -135,4 +136,8 @@ public void commit(Trace trace) {
       blockData.trace(trace.blockdata);
     }
   }
+
+  private TxnData txnData() {
+    return hub.txnData();
+  }
 }

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

@@ -61,6 +61,10 @@ public static AccountSnapshot canonical(Hub hub, Address address) {
         isAddressWarm(hub.messageFrame(), address));
   }
 
+  public static AccountSnapshot canonical(Hub hub, Address address, boolean warmth) {
+    return canonical(hub, address).setWarmthTo(warmth);
+  }
+
   public static AccountSnapshot canonical(Hub hub, WorldView world, Address address) {
     return fromArguments(
         world,

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

@@ -0,0 +1,24 @@
+/*
+ * 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.hub;
+
+import net.consensys.linea.zktracer.ChainConfig;
+
+public class CancunHub extends ShanghaiHub {
+  public CancunHub(ChainConfig chain) {
+    super(chain);
+  }
+}