refactor: move target gas limit to network definition (#9502)

Gabriel-Trintinalia · web-flow · commit 55819c5719c2 · 2025-12-11T10:24:58.000+11:00
Signed-off-by: Gabriel-Trintinalia &lt;gabriel.trintinalia@consensys.net&gt;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java
@@ -326,6 +326,11 @@ private List<String> commandlineArgs(final BesuNode node, final Path dataDir) {
                       node.getMiningParameters().getMinTransactionGasPrice().intValue()));
             });
 
+    if (node.getMiningParameters().getTargetGasLimit().isPresent()) {
+      params.add("--target-gas-limit");
+      params.add(Long.toString(node.getMiningParameters().getTargetGasLimit().getAsLong()));
+    }
+
     if (!node.isP2pEnabled()) {
       params.add("--p2p-enabled");
       params.add("false");
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java
@@ -645,7 +645,8 @@ public BesuNode createExecutionEngineGenesisNode(final String name, final String
                 MiningConfiguration.newDefault()
                     .setCoinbase(AddressHelpers.ofValue(1))
                     .setExtraData(Bytes.EMPTY)
-                    .setMiningEnabled(true))
+                    .setMiningEnabled(true)
+                    .setTargetGasLimit(60_000_000L)) // make tests agnostic to gas limit changes
             .jsonRpcEnabled()
             .jsonRpcTxPool()
             .engineRpcEnabled(true)
diff --git a/app/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/app/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
@@ -2716,8 +2716,8 @@ private String generateConfigurationOverview() {
     if (miningParametersSupplier.get().getTargetGasLimit().isPresent()) {
       builder.setTargetGasLimit(miningParametersSupplier.get().getTargetGasLimit().getAsLong());
     } else {
-      builder.setTargetGasLimit(
-          MergeCoordinator.getDefaultGasLimitByChainId(Optional.of(ethNetworkConfig.networkId())));
+      MergeCoordinator.getDefaultGasLimitByChainId(genesisConfigOptionsSupplier.get().getChainId())
+          .ifPresent(builder::setTargetGasLimit);
     }
 
     builder
diff --git a/app/src/test/java/org/hyperledger/besu/cli/config/EthNetworkConfigTest.java b/app/src/test/java/org/hyperledger/besu/cli/config/EthNetworkConfigTest.java
@@ -105,4 +105,13 @@ public void testBuilderWithNetworkId() {
     assertThat(config.bootNodes()).isNotEmpty();
     assertThat(config.networkId()).isEqualTo(BigInteger.valueOf(42));
   }
+
+  @Test
+  public void testNetworkDefinitionChainIdsMatchGenesis() {
+    for (NetworkDefinition network : NetworkDefinition.values()) {
+      EthNetworkConfig config = EthNetworkConfig.getNetworkConfig(network);
+      assertThat(config.genesisConfig().getConfigOptions().getChainId().orElseThrow())
+          .isEqualTo(network.getChainId());
+    }
+  }
 }
diff --git a/config/src/main/java/org/hyperledger/besu/config/NetworkDefinition.java b/config/src/main/java/org/hyperledger/besu/config/NetworkDefinition.java
@@ -21,71 +21,153 @@
 /** The enum Network name. */
 public enum NetworkDefinition {
   /** Mainnet network name. */
-  MAINNET("/mainnet.json", BigInteger.valueOf(1), true, true),
+  MAINNET(
+      "/mainnet.json",
+      1, // chain id
+      1, // network id
+      true, // can snap sync
+      true, // native required
+      60_000_000L), // target gas limit
   /** Sepolia network name. */
-  SEPOLIA("/sepolia.json", BigInteger.valueOf(11155111), true, true),
+  SEPOLIA(
+      "/sepolia.json",
+      11155111, // chain id
+      11155111, // network id
+      true, // can snap sync
+      true, // native required
+      60_000_000L), // target gas limit
   /** Holešky network name. */
-  HOLESKY("/holesky.json", BigInteger.valueOf(17000), true, true),
+  HOLESKY(
+      "/holesky.json",
+      17000, // chain id
+      17000, // network id
+      true, // can snap sync
+      true, // native required
+      60_000_000L, // target gas limit
+      "November 2025"),
   /** Hoodi network name. */
-  HOODI("/hoodi.json", BigInteger.valueOf(560048), true, true),
+  HOODI(
+      "/hoodi.json",
+      560048, // chain id
+      560048, // network id
+      true, // can snap sync
+      true, // native required
+      60_000_000L), // target gas limit
   /**
    * EPHEMERY network name. The actual networkId used is calculated based on this default value and
    * the current time. <a href="https://ephemery.dev/">Ephemery developer info</a>
    */
-  EPHEMERY("/ephemery.json", BigInteger.valueOf(39438135), true, true),
+  EPHEMERY(
+      "/ephemery.json",
+      39438135, // chain id
+      39438135, // network id
+      true, // can snap sync
+      true, // native required
+      60_000_000L), // target gas limit
   /**
    * Linea mainnet network name <a
    * href="https://docs.linea.build/get-started/how-to/run-a-node/besu">Linea Besu developer
    * info</a>
    */
-  LINEA_MAINNET("/linea-mainnet.json", BigInteger.valueOf(59144), true, true),
+  LINEA_MAINNET(
+      "/linea-mainnet.json",
+      59144, // chain id
+      59144, // network id
+      true, // can snap sync
+      true, // native required
+      60_000_000L), // target gas limit
   /** Linea sepolia network name */
-  LINEA_SEPOLIA("/linea-sepolia.json", BigInteger.valueOf(59141), true, true),
+  LINEA_SEPOLIA(
+      "/linea-sepolia.json",
+      59141, // chain id
+      59141, // network id
+      true, // can snap sync
+      true, // native required
+      60_000_000L), // target gas limit
   /** LUKSO mainnet network name. */
-  LUKSO("/lukso.json", BigInteger.valueOf(42)),
+  LUKSO(
+      "/lukso.json",
+      42, // chain id
+      42, // network id
+      true, // can snap sync
+      false, // native required
+      60_000_000L), // target gas limit
   /** Dev network name. */
-  DEV("/dev.json", BigInteger.valueOf(2018), false),
+  DEV(
+      "/dev.json",
+      1337, // chain id
+      2018, // network id
+      false, // can snap sync
+      false, // native required
+      60_000_000L), // target gas limit
   /** Future EIPs network name. */
-  FUTURE_EIPS("/future.json", BigInteger.valueOf(2022), false),
+  FUTURE_EIPS(
+      "/future.json",
+      2022, // chain id
+      2022, // network id
+      false, // can snap sync
+      false, // native required
+      60_000_000L), // target gas limit
   /** Experimental EIPs network name. */
-  EXPERIMENTAL_EIPS("/experimental.json", BigInteger.valueOf(2023), false),
+  EXPERIMENTAL_EIPS(
+      "/experimental.json",
+      2023, // chain id
+      2023, // network id
+      false, // can snap sync
+      false, // native required
+      60_000_000L), // target gas limit
   /** Classic network name. */
-  CLASSIC("/classic.json", BigInteger.valueOf(1)),
+  CLASSIC(
+      "/classic.json",
+      61, // chain id
+      1, // network id
+      true, // can snap sync
+      false, // native required
+      60_000_000L, // target gas limit
+      "November 2025"),
   /** Mordor network name. */
-  MORDOR("/mordor.json", BigInteger.valueOf(7));
+  MORDOR(
+      "/mordor.json",
+      63, // chain id
+      7, // network id
+      true, // can snap sync
+      false, // native required
+      60_000_000L, // target gas limit
+      "November 2025");
 
   private final String genesisFile;
-  private final BigInteger networkId;
+  private final long chainId;
+  private final long networkId;
   private final boolean canSnapSync;
-  private String deprecationDate;
+  private final String deprecationDate;
   private final boolean nativeRequired;
-
-  static {
-    HOLESKY.deprecationDate = "November 2025";
-    CLASSIC.deprecationDate = "November 2025";
-    MORDOR.deprecationDate = "November 2025";
-  }
-
-  NetworkDefinition(final String genesisFile, final BigInteger networkId) {
-    this(genesisFile, networkId, true);
-  }
+  private final long targetGasLimit;
 
   NetworkDefinition(
-      final String genesisFile, final BigInteger networkId, final boolean canSnapSync) {
-    this(genesisFile, networkId, canSnapSync, false);
+      final String genesisFile,
+      final long chainId,
+      final long networkId,
+      final boolean canSnapSync,
+      final boolean nativeRequired,
+      final long targetGasLimit) {
+    this(genesisFile, chainId, networkId, canSnapSync, nativeRequired, targetGasLimit, null);
   }
 
   NetworkDefinition(
       final String genesisFile,
-      final BigInteger networkId,
+      final long chainId,
+      final long networkId,
       final boolean canSnapSync,
-      final boolean nativeRequired) {
+      final boolean nativeRequired,
+      final long targetGasLimit,
+      final String deprecationDate) {
     this.genesisFile = genesisFile;
+    this.chainId = chainId;
     this.networkId = networkId;
     this.canSnapSync = canSnapSync;
-    // no deprecations planned
-    this.deprecationDate = null;
     this.nativeRequired = nativeRequired;
+    this.targetGasLimit = targetGasLimit;
+    this.deprecationDate = deprecationDate;
   }
 
   /**
@@ -97,13 +179,22 @@ public String getGenesisFile() {
     return genesisFile;
   }
 
+  /**
+   * Gets chain id.
+   *
+   * @return the chain id
+   */
+  public BigInteger getChainId() {
+    return BigInteger.valueOf(chainId);
+  }
+
   /**
    * Gets network id.
    *
    * @return the network id
    */
   public BigInteger getNetworkId() {
-    return networkId;
+    return BigInteger.valueOf(networkId);
   }
 
   /**
@@ -156,4 +247,28 @@ public Optional<String> getDeprecationDate() {
   public boolean hasNativeRequirements() {
     return nativeRequired;
   }
+
+  /**
+   * Gets target gas limit.
+   *
+   * @return the target gas limit
+   */
+  public long getTargetGasLimit() {
+    return targetGasLimit;
+  }
+
+  /**
+   * From chain id.
+   *
+   * @param chainId the chain id
+   * @return the optional
+   */
+  public static Optional<NetworkDefinition> fromChainId(final BigInteger chainId) {
+    for (final NetworkDefinition network : NetworkDefinition.values()) {
+      if (network.getChainId().equals(chainId)) {
+        return Optional.of(network);
+      }
+    }
+    return Optional.empty();
+  }
 }
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinator.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinator.java
@@ -18,6 +18,7 @@
 import static org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator.ForkchoiceResult.Status.INVALID;
 import static org.hyperledger.besu.ethereum.trie.pathbased.common.provider.WorldStateQueryParams.withBlockHeaderAndUpdateNodeHead;
 
+import org.hyperledger.besu.config.NetworkDefinition;
 import org.hyperledger.besu.consensus.merge.MergeContext;
 import org.hyperledger.besu.consensus.merge.PayloadWrapper;
 import org.hyperledger.besu.datatypes.Address;
@@ -83,21 +84,6 @@ public class MergeCoordinator implements MergeMiningCoordinator, BadChainListene
    */
   private static final double TRY_FILL_BLOCK = 1.0;
 
-  // if you change these gas limits, also update the tests in MergeCoordinatorTest
-  private static final long DEFAULT_TARGET_GAS_LIMIT = 60_000_000L;
-  // testnets might have higher gas limits than mainnet and are incrementally updated
-  private static final long DEFAULT_TARGET_GAS_LIMIT_TESTNET = 60_000_000L;
-  // next target gas limit TBD
-  // private static final long NEXT_STEP_TARGET_GAS_LIMIT_TESTNET = 60_000_000L;
-
-  private static final Map<BigInteger, Long> TESTNET_CHAIN_IDS =
-      Map.of(
-          BigInteger.valueOf(11155111), DEFAULT_TARGET_GAS_LIMIT_TESTNET, // Sepolia
-          BigInteger.valueOf(17000), DEFAULT_TARGET_GAS_LIMIT_TESTNET, // Holesky
-          BigInteger.valueOf(560048), DEFAULT_TARGET_GAS_LIMIT_TESTNET, // Hoodi
-          BigInteger.valueOf(39438135), DEFAULT_TARGET_GAS_LIMIT_TESTNET // Ephemery
-          );
-
   /** The Mining parameters. */
   protected final MiningConfiguration miningConfiguration;
 
@@ -186,7 +172,7 @@ public MergeCoordinator(
       miningParams.setCoinbase(Address.ZERO);
     }
     if (miningParams.getTargetGasLimit().isEmpty()) {
-      miningParams.setTargetGasLimit(getDefaultGasLimit(protocolSchedule));
+      getDefaultGasLimit(protocolSchedule).ifPresent(miningParams::setTargetGasLimit);
     }
     miningParams.setMinBlockOccupancyRatio(TRY_FILL_BLOCK);
     this.miningConfiguration = miningParams;
@@ -974,11 +960,11 @@ boolean isBlockCreationCancelled(final PayloadIdentifier payloadId) {
     return job.cancelled.get();
   }
 
-  private long getDefaultGasLimit(final ProtocolSchedule protocolSchedule) {
+  private Optional<Long> getDefaultGasLimit(final ProtocolSchedule protocolSchedule) {
     return protocolSchedule
         .getChainId()
-        .map(TESTNET_CHAIN_IDS::get)
-        .orElse(DEFAULT_TARGET_GAS_LIMIT);
+        .flatMap(NetworkDefinition::fromChainId)
+        .map(NetworkDefinition::getTargetGasLimit);
   }
 
   /**
@@ -987,8 +973,10 @@ private long getDefaultGasLimit(final ProtocolSchedule protocolSchedule) {
    * @param chainId the chain id
    * @return default gas limit by chain id
    */
-  public static long getDefaultGasLimitByChainId(final Optional<BigInteger> chainId) {
-    return chainId.map(TESTNET_CHAIN_IDS::get).orElse(DEFAULT_TARGET_GAS_LIMIT);
+  public static Optional<Long> getDefaultGasLimitByChainId(final Optional<BigInteger> chainId) {
+    return chainId
+        .flatMap(NetworkDefinition::fromChainId)
+        .map(NetworkDefinition::getTargetGasLimit);
   }
 
   private static class BlockCreationTask {
diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java
@@ -1018,14 +1018,14 @@ public void shouldSetCorrectTargetGasLimit(final ArgumentsAccessor argumentsAcce
   @Test
   public void shouldReturnExpectedTargetGasLimitForMainnet() {
     final long targetGasLimitMainnet =
-        MergeCoordinator.getDefaultGasLimitByChainId(Optional.of(CHAIN_ID_MAINNET));
+        MergeCoordinator.getDefaultGasLimitByChainId(Optional.of(CHAIN_ID_MAINNET)).orElseThrow();
     assertThat(targetGasLimitMainnet).isEqualTo(DEFAULT_TARGET_GAS_LIMIT);
   }
 
   @Test
   public void shouldReturnExpectedTargetGasLimitForTestnet() {
     final long targetGasLimitMainnet =
-        MergeCoordinator.getDefaultGasLimitByChainId(Optional.of(CHAIN_ID_HOODI));
+        MergeCoordinator.getDefaultGasLimitByChainId(Optional.of(CHAIN_ID_HOODI)).orElseThrow();
     assertThat(targetGasLimitMainnet).isEqualTo(DEFAULT_TARGET_GAS_LIMIT_TESTNET);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -105,4 +105,13 @@ public void testBuilderWithNetworkId() {`
`105`	`105`	`assertThat(config.bootNodes()).isNotEmpty();`
`106`	`106`	`assertThat(config.networkId()).isEqualTo(BigInteger.valueOf(42));`
`107`	`107`	`}`
	`108`	`+`
	`109`	`+ @Test`
	`110`	`+ public void testNetworkDefinitionChainIdsMatchGenesis() {`
	`111`	`+ for (NetworkDefinition network : NetworkDefinition.values()) {`
	`112`	`+ EthNetworkConfig config = EthNetworkConfig.getNetworkConfig(network);`
	`113`	`+ assertThat(config.genesisConfig().getConfigOptions().getChainId().orElseThrow())`
	`114`	`+ .isEqualTo(network.getChainId());`
	`115`	`+ }`
	`116`	`+ }`
`108`	`117`	`}`