Merge branch 'main' into zkbesu

# Conflicts: # .github/workflows/checks.yml # .github/workflows/codeql.yml # .github/workflows/release.yml # .github/workflows/sonarcloud.yml # build.gradle # gradle.properties
Consensys · Dec 21, 2023 · 1d4b979 · 1d4b979
2 parents 81452ac + 2cf61d6
commit 1d4b979
Show file tree

Hide file tree

Showing 199 changed files with 3,454 additions and 1,748 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,10 @@
 
 ### Additions and Improvements
 - Add error messages on authentication failures with username and password [#6212](https://github.com/hyperledger/besu/pull/6212)
+- New `Sequenced` transaction pool. The pool is an evolution of the `legacy` pool and is likely to be more suitable to enterprise or permissioned chains than the `layered` transaction pool. Select to use this pool with `--tx-pool=sequenced`. Supports the same options as the `legacy` pool [#6211](https://github.com/hyperledger/besu/issues/6211)
+- Set Ethereum Classic mainnet activation block for Spiral network upgrade [#6267](https://github.com/hyperledger/besu/pull/6267)
+- Add custom genesis file name to config overview if specified [#6297](https://github.com/hyperledger/besu/pull/6297)
+- Update Gradle plugins and replace unmaintained License Gradle Plugin with the actively maintained Gradle License Report [#6275](https://github.com/hyperledger/besu/pull/6275)
 
 ### Bug fixes
 

diff --git a/acceptance-tests/test-plugins/build.gradle b/acceptance-tests/test-plugins/build.gradle
@@ -11,7 +11,6 @@ dependencies {
   implementation 'com.google.auto.service:auto-service'
   implementation 'info.picocli:picocli'
 
-  testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.junit.jupiter:junit-jupiter'
 

diff --git a/...s/test-plugins/src/test/java/org/hyperledger/besu/services/BesuPluginContextImplTest.java b/...s/test-plugins/src/test/java/org/hyperledger/besu/services/BesuPluginContextImplTest.java
@@ -29,13 +29,13 @@
 
 import org.assertj.core.api.Assertions;
 import org.assertj.core.api.ThrowableAssert;
-import org.junit.After;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class BesuPluginContextImplTest {
 
-  @BeforeClass
+  @BeforeAll
   public static void createFakePluginDir() throws IOException {
     if (System.getProperty("besu.plugins.dir") == null) {
       final Path pluginDir = Files.createTempDirectory("besuTest");
@@ -44,7 +44,7 @@ public static void createFakePluginDir() throws IOException {
     }
   }
 
-  @After
+  @AfterEach
   public void clearTestPluginState() {
     System.clearProperty("testPicoCLIPlugin.testOption");
   }

diff --git a/...ests/src/test/java/org/hyperledger/besu/tests/acceptance/AbstractPreexistingNodeTest.java b/...ests/src/test/java/org/hyperledger/besu/tests/acceptance/AbstractPreexistingNodeTest.java
@@ -43,15 +43,8 @@
 import org.apache.commons.compress.utils.IOUtils;
 
 public class AbstractPreexistingNodeTest extends AcceptanceTestBase {
-  protected final String testName;
-  protected final String dataPath;
   protected Path hostDataPath;
 
-  public AbstractPreexistingNodeTest(final String testName, final String dataPath) {
-    this.testName = testName;
-    this.dataPath = dataPath;
-  }
-
   protected static void extract(final Path path, final String destDirectory) throws IOException {
     try (final TarArchiveInputStream fin =
         new TarArchiveInputStream(

diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/LoggingTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/LoggingTest.java
@@ -21,7 +21,7 @@
 
 import java.io.IOException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class LoggingTest extends AcceptanceTestBase {
 

diff --git a/...test/java/org/hyperledger/besu/tests/acceptance/backup/BackupRoundTripAcceptanceTest.java b/...test/java/org/hyperledger/besu/tests/acceptance/backup/BackupRoundTripAcceptanceTest.java
@@ -29,72 +29,49 @@
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeConfigurationBuilder;
 
-import java.io.IOException;
 import java.math.BigInteger;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.function.UnaryOperator;
+import java.util.stream.Stream;
 import javax.annotation.Nonnull;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@RunWith(Parameterized.class)
 public class BackupRoundTripAcceptanceTest extends AbstractPreexistingNodeTest {
 
-  private final Path backupPath;
-  private final Path restorePath;
-  private final Path rebackupPath;
-
-  @SuppressWarnings({"unused", "FieldCanBeLocal"})
-  private final List<AccountData> testAccounts;
-
-  @SuppressWarnings({"unused", "FieldCanBeLocal"})
-  private final long expectedChainHeight;
+  private Path backupPath;
+  private Path restorePath;
+  private Path rebackupPath;
+
+  public static Stream<Arguments> getParameters() {
+    // First 10 blocks of ropsten
+    return Stream.of(
+        Arguments.of(
+            "After versioning was enabled and using multiple RocksDB columns",
+            "version1",
+            0xA,
+            singletonList(
+                new AccountData(
+                    "0xd1aeb42885a43b72b518182ef893125814811048",
+                    BigInteger.valueOf(0xA),
+                    Wei.fromHexString("0x2B5E3AF16B1880000")))));
+  }
 
-  public BackupRoundTripAcceptanceTest(
-      final String testName,
-      final String dataPath,
-      final long expectedChainHeight,
-      final List<AccountData> testAccounts)
-      throws IOException {
-    super(testName, dataPath);
-    this.expectedChainHeight = expectedChainHeight;
-    this.testAccounts = testAccounts;
+  public void setUp(final String testName, final String dataPath) throws Exception {
     backupPath = Files.createTempDirectory("backup");
     backupPath.toFile().deleteOnExit();
     restorePath = Files.createTempDirectory("restore");
     restorePath.toFile().deleteOnExit();
     rebackupPath = Files.createTempDirectory("rebackup");
     rebackupPath.toFile().deleteOnExit();
-  }
 
-  @Parameters(name = "{0}")
-  public static Object[][] getParameters() {
-    return new Object[][] {
-      // First 10 blocks of ropsten
-      new Object[] {
-        "After versioning was enabled and using multiple RocksDB columns",
-        "version1",
-        0xA,
-        singletonList(
-            new AccountData(
-                "0xd1aeb42885a43b72b518182ef893125814811048",
-                BigInteger.valueOf(0xA),
-                Wei.fromHexString("0x2B5E3AF16B1880000")))
-      }
-    };
-  }
-
-  @Before
-  public void setUp() throws Exception {
     final URL rootURL = DatabaseMigrationAcceptanceTest.class.getResource(dataPath);
     hostDataPath = copyDataDir(rootURL);
     final Path databaseArchive =
@@ -105,8 +82,16 @@ public void setUp() throws Exception {
     extract(databaseArchive, hostDataPath.toAbsolutePath().toString());
   }
 
-  @Test
-  public void backupRoundtripAndBack() throws IOException {
+  @ParameterizedTest(name = "{index}: {0}")
+  @MethodSource("getParameters")
+  public void backupRoundtripAndBack(
+      final String testName,
+      final String dataPath,
+      final long expectedChainHeight,
+      final List<AccountData> testAccounts)
+      throws Exception {
+
+    setUp(testName, dataPath);
 
     // backup from existing files
     final BesuNode backupNode =

diff --git a/.../src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterAcceptanceTest.java b/.../src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterAcceptanceTest.java
@@ -17,15 +17,15 @@
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ClusterAcceptanceTest extends AcceptanceTestBase {
 
   private Node minerNode;
   private Node fullNode;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     minerNode = besu.createMinerNode("node1");
     fullNode = besu.createArchiveNode("node2");

diff --git a/...ava/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterNoDiscoveryAcceptanceTest.java b/...ava/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterNoDiscoveryAcceptanceTest.java
@@ -20,16 +20,16 @@
 import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration;
 import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ClusterNoDiscoveryAcceptanceTest extends AcceptanceTestBase {
 
   private Node fullNode;
   private Node noDiscoveryNode;
   private Cluster noDiscoveryCluster;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     final ClusterConfiguration clusterConfiguration =
         new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();

diff --git a/...rg/hyperledger/besu/tests/acceptance/bootstrap/ClusterThreadNodeRunnerAcceptanceTest.java b/...rg/hyperledger/besu/tests/acceptance/bootstrap/ClusterThreadNodeRunnerAcceptanceTest.java
@@ -23,15 +23,15 @@
 import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration;
 import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ClusterThreadNodeRunnerAcceptanceTest extends AcceptanceTestBase {
 
   private Node fullNode;
   private Cluster noDiscoveryCluster;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     final ClusterConfiguration clusterConfiguration =
         new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();

diff --git a/.../test/java/org/hyperledger/besu/tests/acceptance/bootstrap/P2pDisabledAcceptanceTest.java b/.../test/java/org/hyperledger/besu/tests/acceptance/bootstrap/P2pDisabledAcceptanceTest.java
@@ -20,14 +20,14 @@
 import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration;
 import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class P2pDisabledAcceptanceTest extends AcceptanceTestBase {
   private Node node;
   private Cluster p2pDisabledCluster;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     final ClusterConfiguration clusterConfiguration =
         new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();

diff --git a/.../test/java/org/hyperledger/besu/tests/acceptance/bootstrap/StaticNodesAcceptanceTest.java b/.../test/java/org/hyperledger/besu/tests/acceptance/bootstrap/StaticNodesAcceptanceTest.java
@@ -20,15 +20,15 @@
 
 import java.util.Arrays;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class StaticNodesAcceptanceTest extends AcceptanceTestBase {
 
   private Node otherNode;
   private Node node;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     otherNode = besu.createNodeWithNoDiscovery("other-node");
     cluster.start(otherNode);

diff --git a/...src/test/java/org/hyperledger/besu/tests/acceptance/config/BootNodesGenesisSetupTest.java b/...src/test/java/org/hyperledger/besu/tests/acceptance/config/BootNodesGenesisSetupTest.java
@@ -29,9 +29,9 @@
 import org.bouncycastle.asn1.sec.SECNamedCurves;
 import org.bouncycastle.asn1.x9.X9ECParameters;
 import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class BootNodesGenesisSetupTest extends AcceptanceTestBase {
   private static final String CURVE_NAME = "secp256k1";
@@ -42,13 +42,13 @@ public class BootNodesGenesisSetupTest extends AcceptanceTestBase {
   private Node nodeA;
   private Node nodeB;
 
-  @BeforeClass
+  @BeforeAll
   public static void environment() {
     final X9ECParameters params = SECNamedCurves.getByName(CURVE_NAME);
     curve = new ECDomainParameters(params.getCurve(), params.getG(), params.getN(), params.getH());
   }
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     int nodeAP2pBindingPort;
     int nodeBP2pBindingPort;

diff --git a/...s/src/test/java/org/hyperledger/besu/tests/acceptance/crypto/SECP256R1AcceptanceTest.java b/...s/src/test/java/org/hyperledger/besu/tests/acceptance/crypto/SECP256R1AcceptanceTest.java
@@ -32,8 +32,8 @@
 import java.util.List;
 
 import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class SECP256R1AcceptanceTest extends AcceptanceTestBase {
   private Node minerNode;
@@ -49,7 +49,7 @@ public class SECP256R1AcceptanceTest extends AcceptanceTestBase {
 
   private static final SECP256R1 SECP256R1_SIGNATURE_ALGORITHM = new SECP256R1();
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     KeyPair minerNodeKeyPair = createKeyPair(MINER_NODE_PRIVATE_KEY);
     KeyPair otherNodeKeyPair = createKeyPair(OTHER_NODE_PRIVATE_KEY);