Make sure chainId is present and positive

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
Consensys · Oct 8, 2024 · 1acfa70 · 1acfa70
1 parent 18498af
commit 1acfa70
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 52 deletions.
diff --git a/sequencer/src/main/java/net/consensys/linea/AbstractLineaRequiredPlugin.java b/sequencer/src/main/java/net/consensys/linea/AbstractLineaRequiredPlugin.java
@@ -18,9 +18,11 @@
 import lombok.extern.slf4j.Slf4j;
 import org.hyperledger.besu.plugin.BesuContext;
 import org.hyperledger.besu.plugin.BesuPlugin;
+import org.hyperledger.besu.plugin.services.BlockchainService;
 
 @Slf4j
 public abstract class AbstractLineaRequiredPlugin extends AbstractLineaPrivateOptionsPlugin {
+  protected BlockchainService blockchainService;
 
   /**
    * Linea plugins extending this class will halt startup of Besu in case of exception during
@@ -34,7 +36,15 @@ public abstract class AbstractLineaRequiredPlugin extends AbstractLineaPrivateOp
   public void register(final BesuContext context) {
     super.register(context);
     try {
-      log.info("Registering Linea plugin " + this.getClass().getName());
+      log.info("Registering Linea plugin {}", this.getClass().getName());
+
+      blockchainService =
+          context
+              .getService(BlockchainService.class)
+              .orElseThrow(
+                  () ->
+                      new RuntimeException(
+                          "Failed to obtain BlockchainService from the BesuContext."));
 
       doRegister(context);
 
@@ -52,4 +62,21 @@ public void register(final BesuContext context) {
    * @param context
    */
   public abstract void doRegister(final BesuContext context);
+
+  @Override
+  public void beforeExternalServices() {
+    super.beforeExternalServices();
+
+    blockchainService
+        .getChainId()
+        .ifPresentOrElse(
+            chainId -> {
+              if (chainId.signum() <= 0) {
+                throw new IllegalArgumentException("Chain id must be greater than zero.");
+              }
+            },
+            () -> {
+              throw new IllegalArgumentException("Chain id required");
+            });
+  }
 }
diff --git a/sequencer/src/main/java/net/consensys/linea/extradata/LineaExtraDataPlugin.java b/sequencer/src/main/java/net/consensys/linea/extradata/LineaExtraDataPlugin.java
@@ -23,7 +23,6 @@
 import org.hyperledger.besu.plugin.BesuContext;
 import org.hyperledger.besu.plugin.BesuPlugin;
 import org.hyperledger.besu.plugin.services.BesuEvents;
-import org.hyperledger.besu.plugin.services.BlockchainService;
 import org.hyperledger.besu.plugin.services.RpcEndpointService;
 
 /** This plugin registers handlers that are activated when new blocks are imported */
@@ -33,7 +32,6 @@ public class LineaExtraDataPlugin extends AbstractLineaRequiredPlugin {
   public static final String NAME = "linea";
   private BesuContext besuContext;
   private RpcEndpointService rpcEndpointService;
-  private BlockchainService blockchainService;
 
   @Override
   public Optional<String> getName() {
@@ -50,13 +48,6 @@ public void doRegister(final BesuContext context) {
                 () ->
                     new RuntimeException(
                         "Failed to obtain RpcEndpointService from the BesuContext."));
-    blockchainService =
-        context
-            .getService(BlockchainService.class)
-            .orElseThrow(
-                () ->
-                    new RuntimeException(
-                        "Failed to obtain BlockchainService from the BesuContext."));
   }
 
   /**

diff --git a/sequencer/src/main/java/net/consensys/linea/rpc/methods/LineaEstimateGas.java b/sequencer/src/main/java/net/consensys/linea/rpc/methods/LineaEstimateGas.java
@@ -270,8 +270,7 @@ private Long estimateGasUsed(
 
     final var estimateGasTracer = new EstimateGasOperationTracer();
     final var chainHeadHeader = blockchainService.getChainHeadHeader();
-    final BigInteger nonnegativeChainId = blockchainService.getChainId().orElseThrow().abs();
-    final var zkTracer = createZkTracer(chainHeadHeader, nonnegativeChainId);
+    final var zkTracer = createZkTracer(chainHeadHeader, blockchainService.getChainId().get());
     final TracerAggregator zkAndGasTracer = TracerAggregator.create(estimateGasTracer, zkTracer);
 
     final var chainHeadHash = chainHeadHeader.getBlockHash();
@@ -492,9 +491,8 @@ private Transaction createTransactionForSimulation(
     return txBuilder.build();
   }
 
-  private ZkTracer createZkTracer(
-      final BlockHeader chainHeadHeader, final BigInteger nonnegativeChainId) {
-    var zkTracer = new ZkTracer(l1L2BridgeConfiguration, nonnegativeChainId);
+  private ZkTracer createZkTracer(final BlockHeader chainHeadHeader, final BigInteger chainId) {
+    var zkTracer = new ZkTracer(l1L2BridgeConfiguration, chainId);
     zkTracer.traceStartConflation(1L);
     zkTracer.traceStartBlock(chainHeadHeader);
     return zkTracer;

diff --git a/sequencer/src/main/java/net/consensys/linea/rpc/services/LineaEstimateGasEndpointPlugin.java b/sequencer/src/main/java/net/consensys/linea/rpc/services/LineaEstimateGasEndpointPlugin.java
@@ -24,7 +24,6 @@
 import org.hyperledger.besu.plugin.BesuContext;
 import org.hyperledger.besu.plugin.BesuPlugin;
 import org.hyperledger.besu.plugin.services.BesuConfiguration;
-import org.hyperledger.besu.plugin.services.BlockchainService;
 import org.hyperledger.besu.plugin.services.RpcEndpointService;
 import org.hyperledger.besu.plugin.services.TransactionSimulationService;
 
@@ -35,7 +34,6 @@ public class LineaEstimateGasEndpointPlugin extends AbstractLineaRequiredPlugin
   private BesuConfiguration besuConfiguration;
   private RpcEndpointService rpcEndpointService;
   private TransactionSimulationService transactionSimulationService;
-  private BlockchainService blockchainService;
   private LineaEstimateGas lineaEstimateGasMethod;
 
   /**
@@ -69,14 +67,6 @@ public void doRegister(final BesuContext context) {
                     new RuntimeException(
                         "Failed to obtain TransactionSimulatorService from the BesuContext."));
 
-    blockchainService =
-        context
-            .getService(BlockchainService.class)
-            .orElseThrow(
-                () ->
-                    new RuntimeException(
-                        "Failed to obtain BlockchainService from the BesuContext."));
-
     lineaEstimateGasMethod =
         new LineaEstimateGas(
             besuConfiguration, transactionSimulationService, blockchainService, rpcEndpointService);

diff --git a/...a/net/consensys/linea/sequencer/txpoolvalidation/LineaTransactionPoolValidatorPlugin.java b/...a/net/consensys/linea/sequencer/txpoolvalidation/LineaTransactionPoolValidatorPlugin.java
@@ -34,7 +34,6 @@
 import org.hyperledger.besu.plugin.BesuContext;
 import org.hyperledger.besu.plugin.BesuPlugin;
 import org.hyperledger.besu.plugin.services.BesuConfiguration;
-import org.hyperledger.besu.plugin.services.BlockchainService;
 import org.hyperledger.besu.plugin.services.TransactionPoolValidatorService;
 import org.hyperledger.besu.plugin.services.TransactionSimulationService;
 
@@ -49,7 +48,6 @@
 public class LineaTransactionPoolValidatorPlugin extends AbstractLineaRequiredPlugin {
   public static final String NAME = "linea";
   private BesuConfiguration besuConfiguration;
-  private BlockchainService blockchainService;
   private TransactionPoolValidatorService transactionPoolValidatorService;
   private TransactionSimulationService transactionSimulationService;
   private Optional<JsonRpcManager> rejectedTxJsonRpcManager = Optional.empty();
@@ -69,14 +67,6 @@ public void doRegister(final BesuContext context) {
                     new RuntimeException(
                         "Failed to obtain BesuConfiguration from the BesuContext."));
 
-    blockchainService =
-        context
-            .getService(BlockchainService.class)
-            .orElseThrow(
-                () ->
-                    new RuntimeException(
-                        "Failed to obtain BlockchainService from the BesuContext."));
-
     transactionPoolValidatorService =
         context
             .getService(TransactionPoolValidatorService.class)
@@ -97,6 +87,7 @@ public void doRegister(final BesuContext context) {
   @Override
   public void start() {
     super.start();
+
     try (Stream<String> lines =
         Files.lines(
             Path.of(new File(transactionPoolValidatorConfiguration().denyListPath()).toURI()))) {

diff --git a/...n/java/net/consensys/linea/sequencer/txpoolvalidation/validators/SimulationValidator.java b/...n/java/net/consensys/linea/sequencer/txpoolvalidation/validators/SimulationValidator.java
@@ -86,9 +86,8 @@ public Optional<String> validateTransaction(
       final ModuleLineCountValidator moduleLineCountValidator =
           new ModuleLineCountValidator(moduleLineLimitsMap);
       final var chainHeadHeader = blockchainService.getChainHeadHeader();
-      final BigInteger nonnegativeChainId = blockchainService.getChainId().orElseThrow().abs();
 
-      final var zkTracer = createZkTracer(chainHeadHeader, nonnegativeChainId);
+      final var zkTracer = createZkTracer(chainHeadHeader, blockchainService.getChainId().get());
       final var maybeSimulationResults =
           transactionSimulationService.simulate(
               transaction, chainHeadHeader.getBlockHash(), zkTracer, true);
@@ -172,9 +171,8 @@ private void logSimulationResult(
         .log();
   }
 
-  private ZkTracer createZkTracer(
-      final BlockHeader chainHeadHeader, BigInteger nonnegativeChainId) {
-    var zkTracer = new ZkTracer(l1L2BridgeConfiguration, nonnegativeChainId);
+  private ZkTracer createZkTracer(final BlockHeader chainHeadHeader, BigInteger chainId) {
+    var zkTracer = new ZkTracer(l1L2BridgeConfiguration, chainId);
     zkTracer.traceStartConflation(1L);
     zkTracer.traceStartBlock(chainHeadHeader);
     return zkTracer;

diff --git a/...c/main/java/net/consensys/linea/sequencer/txselection/LineaTransactionSelectorPlugin.java b/...c/main/java/net/consensys/linea/sequencer/txselection/LineaTransactionSelectorPlugin.java
@@ -28,7 +28,6 @@
 import org.hyperledger.besu.plugin.BesuContext;
 import org.hyperledger.besu.plugin.BesuPlugin;
 import org.hyperledger.besu.plugin.services.BesuConfiguration;
-import org.hyperledger.besu.plugin.services.BlockchainService;
 import org.hyperledger.besu.plugin.services.TransactionSelectionService;
 
 /**
@@ -41,7 +40,6 @@
 public class LineaTransactionSelectorPlugin extends AbstractLineaRequiredPlugin {
   public static final String NAME = "linea";
   private TransactionSelectionService transactionSelectionService;
-  private BlockchainService blockchainService;
   private Optional<JsonRpcManager> rejectedTxJsonRpcManager = Optional.empty();
   private BesuConfiguration besuConfiguration;
 
@@ -60,14 +58,6 @@ public void doRegister(final BesuContext context) {
                     new RuntimeException(
                         "Failed to obtain TransactionSelectionService from the BesuContext."));
 
-    blockchainService =
-        context
-            .getService(BlockchainService.class)
-            .orElseThrow(
-                () ->
-                    new RuntimeException(
-                        "Failed to obtain BlockchainService from the BesuContext."));
-
     besuConfiguration =
         context
             .getService(BesuConfiguration.class)
@@ -80,6 +70,7 @@ public void doRegister(final BesuContext context) {
   @Override
   public void start() {
     super.start();
+
     final LineaTransactionSelectorConfiguration txSelectorConfiguration =
         transactionSelectorConfiguration();
     final LineaRejectedTxReportingConfiguration lineaRejectedTxReportingConfiguration =

diff --git a/...in/java/net/consensys/linea/sequencer/txselection/selectors/LineaTransactionSelector.java b/...in/java/net/consensys/linea/sequencer/txselection/selectors/LineaTransactionSelector.java
@@ -80,7 +80,11 @@ private List<PluginTransactionSelector> createTransactionSelectors(
 
     traceLineLimitTransactionSelector =
         new TraceLineLimitTransactionSelector(
-            limitsMap, txSelectorConfiguration, l1L2BridgeConfiguration, tracerConfiguration);
+            blockchainService.getChainId().get(),
+            limitsMap,
+            txSelectorConfiguration,
+            l1L2BridgeConfiguration,
+            tracerConfiguration);
 
     return List.of(
         new MaxBlockCallDataTransactionSelector(txSelectorConfiguration.maxBlockCallDataSize()),

diff --git a/...et/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelector.java b/...et/consensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelector.java
@@ -19,6 +19,7 @@
 import static net.consensys.linea.sequencer.txselection.LineaTransactionSelectionResult.TX_MODULE_LINE_COUNT_OVERFLOW_CACHED;
 import static org.hyperledger.besu.plugin.data.TransactionSelectionResult.SELECTED;
 
+import java.math.BigInteger;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
@@ -56,13 +57,15 @@ public class TraceLineLimitTransactionSelector implements PluginTransactionSelec
   private static final Marker BLOCK_LINE_COUNT_MARKER = MarkerFactory.getMarker("BLOCK_LINE_COUNT");
   @VisibleForTesting protected static Set<Hash> overLineCountLimitCache = new LinkedHashSet<>();
   private final ZkTracer zkTracer;
+  private final BigInteger chainId;
   private final String limitFilePath;
   private final Map<String, Integer> moduleLimits;
   private final int overLimitCacheSize;
   private final ModuleLineCountValidator moduleLineCountAccumulator;
   private Map<String, Integer> currCumulatedLineCount;
 
   public TraceLineLimitTransactionSelector(
+      final BigInteger chainId,
       final Map<String, Integer> moduleLimits,
       final LineaTransactionSelectorConfiguration txSelectorConfiguration,
       final LineaL1L2BridgeSharedConfiguration l1L2BridgeConfiguration,
@@ -72,6 +75,7 @@ public TraceLineLimitTransactionSelector(
       System.exit(1);
     }
 
+    this.chainId = chainId;
     this.moduleLimits = moduleLimits;
     this.limitFilePath = tracerConfiguration.moduleLimitsFilePath();
     this.overLimitCacheSize = txSelectorConfiguration.overLinesLimitCacheSize();
@@ -217,7 +221,7 @@ private String logTxLineCount() {
 
   private class ZkTracerWithLog extends ZkTracer {
     public ZkTracerWithLog(final LineaL1L2BridgeSharedConfiguration bridgeConfiguration) {
-      super(bridgeConfiguration);
+      super(bridgeConfiguration, chainId);
     }
 
     @Override

diff --git a/...va/net/consensys/linea/sequencer/txpoolvalidation/validators/SimulationValidatorTest.java b/...va/net/consensys/linea/sequencer/txpoolvalidation/validators/SimulationValidatorTest.java
@@ -131,6 +131,7 @@ public void initialize(final WireMockRuntimeInfo wmInfo) throws MalformedURLExce
     final var blockHeader = mock(BlockHeader.class);
     when(blockHeader.getBaseFee()).thenReturn(Optional.of(BASE_FEE));
     when(blockchainService.getChainHeadHeader()).thenReturn(blockHeader);
+    when(blockchainService.getChainId()).thenReturn(Optional.of(BigInteger.ONE));
 
     final var rejectedTxReportingConf =
         LineaRejectedTxReportingConfiguration.builder()

diff --git a/...onsensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelectorTest.java b/...onsensys/linea/sequencer/txselection/selectors/TraceLineLimitTransactionSelectorTest.java
@@ -22,6 +22,7 @@
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
+import java.math.BigInteger;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -250,6 +251,7 @@ private class TestableTraceLineLimitTransactionSelector
         final Map<String, Integer> moduleLimits,
         final int overLimitCacheSize) {
       super(
+          BigInteger.ONE,
           moduleLimits,
           LineaTransactionSelectorConfiguration.builder()
               .overLinesLimitCacheSize(overLimitCacheSize)