Merge branch 'hyperledger:main' into test-blob-gas-instead-long

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Additions and Improvements
 - Add new methods to `OperationTracer` to capture contexts enter/exit [#5756](https://github.com/hyperledger/besu/pull/5756)
+- Add Holešky as predefined network name [#5797](https://github.com/hyperledger/besu/pull/5797)
 
 ### Breaking Changes
 - Add ABI-decoded revert reason to `eth_call` and `eth_estimateGas` responses [#5705](https://github.com/hyperledger/besu/issues/5705)
@@ -29,6 +30,7 @@
 ### Breaking Changes
 - Removed deprecated GoQuorum permissioning interop [#5607](https://github.com/hyperledger/besu/pull/5607)
 - Removed support for version 0 of the database as it is no longer used by any active node. [#5698](https://github.com/hyperledger/besu/pull/5698)
+- Removed support for Kotti network (ETC) [#5816](https://github.com/hyperledger/besu/pull/5816)
 
 ### Additions and Improvements
 - `evmtool` launcher binaries now ship as part of the standard distribution. [#5701](https://github.com/hyperledger/besu/pull/5701)

besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java

@@ -27,6 +27,9 @@ public enum NetworkName {
   SEPOLIA("/sepolia.json", BigInteger.valueOf(11155111)),
   /** Goerli network name. */
   GOERLI("/goerli.json", BigInteger.valueOf(5)),
+  /** Holešky network name. */
+  HOLESKY("/holesky.json", BigInteger.valueOf(17000)),
+
   /** Dev network name. */
   DEV("/dev.json", BigInteger.valueOf(2018), false),
   /** Future EIPs network name. */
@@ -35,8 +38,6 @@ public enum NetworkName {
   EXPERIMENTAL_EIPS("/experimental.json", BigInteger.valueOf(2023), false),
   /** Classic network name. */
   CLASSIC("/classic.json", BigInteger.valueOf(1)),
-  /** Kotti network name. */
-  KOTTI("/kotti.json", BigInteger.valueOf(6)),
   /** Mordor network name. */
   MORDOR("/mordor.json", BigInteger.valueOf(7));
 

besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java

@@ -81,6 +81,14 @@ public static Collection<Object[]> parameters() {
                 new ForkId(Bytes.ofUnsignedInt(0xf7f9bc08L), 0L),
                 new ForkId(Bytes.ofUnsignedInt(0xf7f9bc08L), 0L))
           },
+          new Object[] {
+            NetworkName.HOLESKY,
+            List.of(
+                new ForkId(Bytes.ofUnsignedInt(0xa200f558L), 1694790240L),
+                new ForkId(Bytes.ofUnsignedInt(0x840a3b53L), 2000000000L),
+                new ForkId(Bytes.ofUnsignedInt(0x30771f90), 0L),
+                new ForkId(Bytes.ofUnsignedInt(0x30771f90), 0L))
+          },
           new Object[] {
             NetworkName.GOERLI,
             List.of(
@@ -123,17 +131,6 @@ public static Collection<Object[]> parameters() {
                 new ForkId(Bytes.ofUnsignedInt(0x8c9b1797L), 0L),
                 new ForkId(Bytes.ofUnsignedInt(0x8c9b1797L), 0L))
           },
-          new Object[] {
-            NetworkName.KOTTI,
-            List.of(
-                new ForkId(Bytes.ofUnsignedInt(0x550152eL), 716617L),
-                new ForkId(Bytes.ofUnsignedInt(0xa3270822L), 1705549L),
-                new ForkId(Bytes.ofUnsignedInt(0x8f3698e0L), 2200013L),
-                new ForkId(Bytes.ofUnsignedInt(0x6f402821L), 4368634),
-                new ForkId(Bytes.ofUnsignedInt(0xf03e54e7L), 5578000L),
-                new ForkId(Bytes.ofUnsignedInt(0xc5459816L), 0L),
-                new ForkId(Bytes.ofUnsignedInt(0xc5459816L), 0L))
-          },
           new Object[] {
             NetworkName.CLASSIC,
             List.of(

besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java

@@ -24,7 +24,7 @@
 import static org.hyperledger.besu.cli.config.NetworkName.EXPERIMENTAL_EIPS;
 import static org.hyperledger.besu.cli.config.NetworkName.FUTURE_EIPS;
 import static org.hyperledger.besu.cli.config.NetworkName.GOERLI;
-import static org.hyperledger.besu.cli.config.NetworkName.KOTTI;
+import static org.hyperledger.besu.cli.config.NetworkName.HOLESKY;
 import static org.hyperledger.besu.cli.config.NetworkName.MAINNET;
 import static org.hyperledger.besu.cli.config.NetworkName.MORDOR;
 import static org.hyperledger.besu.cli.config.NetworkName.SEPOLIA;
@@ -85,6 +85,7 @@
 import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
 import org.hyperledger.besu.ethereum.worldstate.PrunerConfiguration;
 import org.hyperledger.besu.evm.precompile.AbstractAltBnPrecompiledContract;
+import org.hyperledger.besu.evm.precompile.KZGPointEvalPrecompiledContract;
 import org.hyperledger.besu.metrics.StandardMetricCategory;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.nat.NatMethod;
@@ -206,11 +207,19 @@ public class BesuCommandTest extends CommandTestAbstract {
 
   @Before
   public void setup() {
+    try {
+      // optimistically tear down a potential previous loaded trusted setup
+      KZGPointEvalPrecompiledContract.tearDown();
+    } catch (Throwable ignore) {
+      // and ignore errors in case no trusted setup was already loaded
+    }
+
     MergeConfigOptions.setMergeEnabled(false);
   }
 
   @After
   public void tearDown() {
+
     MergeConfigOptions.setMergeEnabled(false);
   }
 
@@ -4066,32 +4075,34 @@ public void sepoliaValuesAreUsed() {
   }
 
   @Test
-  public void classicValuesAreUsed() throws Exception {
-    parseCommand("--network", "classic");
+  public void holeskyValuesAreUsed() {
+    parseCommand("--network", "holesky");
 
     final ArgumentCaptor<EthNetworkConfig> networkArg =
         ArgumentCaptor.forClass(EthNetworkConfig.class);
 
     verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
-    assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(CLASSIC));
+    assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(HOLESKY));
 
     assertThat(commandOutput.toString(UTF_8)).isEmpty();
     assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+
+    verify(mockLogger, never()).warn(contains("Holesky is deprecated and will be shutdown"));
   }
 
   @Test
-  public void kottiValuesAreUsed() throws Exception {
-    parseCommand("--network", "kotti");
+  public void classicValuesAreUsed() throws Exception {
+    parseCommand("--network", "classic");
 
     final ArgumentCaptor<EthNetworkConfig> networkArg =
         ArgumentCaptor.forClass(EthNetworkConfig.class);
 
     verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
-    assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(KOTTI));
+    assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(CLASSIC));
 
     assertThat(commandOutput.toString(UTF_8)).isEmpty();
     assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
@@ -4138,11 +4149,6 @@ public void classicValuesCanBeOverridden() throws Exception {
     networkValuesCanBeOverridden("classic");
   }
 
-  @Test
-  public void kottiValuesCanBeOverridden() throws Exception {
-    networkValuesCanBeOverridden("kotti");
-  }
-
   @Test
   public void mordorValuesCanBeOverridden() throws Exception {
     networkValuesCanBeOverridden("mordor");

besu/src/test/java/org/hyperledger/besu/cli/NetworkDeprecationMessageTest.java

@@ -39,7 +39,7 @@ void shouldGenerateDeprecationMessageForDeprecatedNetworks(final NetworkName net
   @EnumSource(
       value = NetworkName.class,
       names = {
-        "MAINNET", "SEPOLIA", "GOERLI", "DEV", "CLASSIC", "KOTTI", "MORDOR",
+        "MAINNET", "SEPOLIA", "GOERLI", "DEV", "CLASSIC", "MORDOR", "HOLESKY",
       })
   void shouldThrowErrorForNonDeprecatedNetworks(final NetworkName network) {
     assertThatThrownBy(() -> NetworkDeprecationMessage.generate(network))

besu/src/test/java/org/hyperledger/besu/ethereum/p2p/config/DefaultDiscoveryConfiguration.java

@@ -109,25 +109,6 @@ public class DefaultDiscoveryConfiguration {
                   "enode://5cd218959f8263bc3721d7789070806b0adff1a0ed3f95ec886fb469f9362c7507e3b32b256550b9a7964a23a938e8d42d45a0c34b332bfebc54b29081e83b93@35.187.57.94:30303")
               .map(EnodeURLImpl::fromString)
               .collect(toList()));
-  public static final List<EnodeURL> KOTTI_BOOTSTRAP_NODES =
-      Collections.unmodifiableList(
-          Stream.of(
-                  // Authority Nodes
-                  "enode://a59e33ccd2b3e52d578f1fbd70c6f9babda2650f0760d6ff3b37742fdcdfdb3defba5d56d315b40c46b70198c7621e63ffa3f987389c7118634b0fefbbdfa7fd@51.158.191.43:37956", // @q9f Mizar
-                  "enode://93c94e999be5dd854c5d82a7cf5c14822973b5d9badb56ad4974586ec4d4f1995c815af795c20bb6e0a6226d3ee55808435c4dc89baf94ee581141b064d19dfc@80.187.116.161:25720",
-                  "enode://ae8658da8d255d1992c3ec6e62e11d6e1c5899aa1566504bc1ff96a0c9c8bd44838372be643342553817f5cc7d78f1c83a8093dee13d77b3b0a583c050c81940@18.232.185.151:30303",
-                  "enode://b477ca6d507a3f57070783eb62ba838847635f8b1a0cbffb8b7f8173f5894cf550f0225a5c279341e2d862a606e778b57180a4f1db3db78c51eadcfa4fdc6963@40.68.240.160:30303",
-
-                  // @q9f Bootnodes
-                  "enode://4956f6924335c951cb70cbc169a85c081f6ff0b374aa2815453b8a3132b49613f38a1a6b8e103f878dbec86364f60091e92a376d7cd3aca9d82d2f2554794e63@51.15.97.240:41235", // @q9f Ginan
-                  "enode://6c9a052c01bb9995fa53bebfcdbc17733fe90708270d0e6d8e38dc57b32e1dbe8c287590b634ee9753b94ba302f411c96519c7fa07df0df6a6848149d819b2c5@51.15.70.7:41235", // @q9f Polis
-                  "enode://95a7302fd8f35d9ad716a591b90dfe839dbf2d3d6a6737ef39e07899f844ad82f1659dd6212492922dd36705fb0a1e984c1d5d5c42069d5bd329388831e820c1@51.15.97.240:45678", // @q9f Ginan
-                  "enode://8c5c4dec9a0728c7058d3c29698bae888adc244e443cebc21f3d708a20751511acbf98a52b5e5ea472f8715c658913e8084123461fd187a4980a0600420b0791@51.15.70.7:45678", // @q9f Polis
-                  "enode://efd7391a3bed73ad74ae5760319bb48f9c9f1983ff22964422688cdb426c5d681004ece26c47121396653cf9bafe7104aa4ecff70e24cc5b11fd76be8e5afce0@51.158.191.43:45678", // @q9f Mizar
-                  "enode://93b12383c74c39b67afa99a7ff44ce250fe94295fa1fc087465cc4fe2d0b33b91a8d8cabe03b250104a9096aa0e06bcde5f95665a5bd9f890edd2ab33e16ae47@51.15.41.19:30303" // @q9f Zibal
-                  )
-              .map(EnodeURLImpl::fromString)
-              .collect(toList()));
   public static final List<EnodeURL> MORDOR_BOOTSTRAP_NODES =
       Collections.unmodifiableList(
           Stream.of(