Merge branch 'main' of github.com:hyperledger/besu into pki-junit-5

hyperledger · Dec 7, 2023 · deaff95 · deaff95
2 parents ae64d72 + 1774b4e
commit deaff95
Show file tree

Hide file tree

Showing 28 changed files with 83 additions and 51 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -424,9 +424,11 @@ workflows:
       - acceptanceTestsCliqueBft:
           requires:
             - assemble
+            - acceptanceTests
       - acceptanceTestsPermissioning:
           requires:
             - assemble
+            - acceptanceTestsCliqueBft
       - buildDocker:
           requires:
             - assemble

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## 23.10.4
+
+### Breaking Changes
+
+### Deprecations
+- Forest pruning (`pruning-enabled` options) is deprecated and will be removed soon. To save disk space consider switching to Bonsai data storage format [#6230](https://github.com/hyperledger/besu/pull/6230)
+
+### Additions and Improvements
+- Add error messages on authentication failures with username and password [#6212](https://github.com/hyperledger/besu/pull/6212)
+
+### Bug fixes
+
+
 ## 23.10.3
 
 ### Breaking Changes

diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
@@ -2059,6 +2059,11 @@ private void issueOptionWarnings() {
           "--privacy-onchain-groups-enabled",
           "--privacy-flexible-groups-enabled");
     }
+
+    if (isPruningEnabled()) {
+      logger.warn(
+          "Forest pruning is deprecated and will be removed soon. To save disk space consider switching to Bonsai data storage format.");
+    }
   }
 
   private void configure() throws Exception {

diff --git a/besu/src/main/java/org/hyperledger/besu/services/TraceServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/TraceServiceImpl.java
@@ -212,7 +212,6 @@ private List<TransactionProcessingResult> trace(
                               .orElse(BlobGas.ZERO));
 
               final WorldUpdater worldUpdater = chainUpdater.getNextUpdater();
-              tracer.traceStartTransaction(worldUpdater, transaction);
               final TransactionProcessingResult result =
                   transactionProcessor.processTransaction(
                       blockchain,
@@ -225,16 +224,6 @@ private List<TransactionProcessingResult> trace(
                       false,
                       blobGasPrice);
 
-              long transactionGasUsed = transaction.getGasLimit() - result.getGasRemaining();
-              tracer.traceEndTransaction(
-                  worldUpdater,
-                  transaction,
-                  result.isSuccessful(),
-                  result.getOutput(),
-                  result.getLogs(),
-                  transactionGasUsed,
-                  0);
-
               results.add(result);
             });
 

diff --git a/besu/src/test/java/org/hyperledger/besu/PrivacyTest.java b/besu/src/test/java/org/hyperledger/besu/PrivacyTest.java
@@ -68,7 +68,7 @@ public class PrivacyTest {
 
   private final Vertx vertx = Vertx.vertx();
 
-  @TempDir private static Path dataDir;
+  @TempDir private Path dataDir;
 
   @AfterEach
   public void cleanUp() {

diff --git a/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
@@ -3815,6 +3815,21 @@ public void pruningParametersAreCaptured() throws Exception {
     assertThat(pruningArg.getValue().getBlockConfirmations()).isEqualTo(4);
   }
 
+  @Test
+  public void pruningLogsDeprecationWarning() {
+    parseCommand("--pruning-enabled");
+
+    verify(mockControllerBuilder).isPruningEnabled(true);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    verify(mockLogger)
+        .warn(
+            contains(
+                "Forest pruning is deprecated and will be removed soon."
+                    + " To save disk space consider switching to Bonsai data storage format."));
+  }
+
   @Test
   public void devModeOptionMustBeUsed() throws Exception {
     parseCommand("--network", "dev");

diff --git a/crypto/algorithms/build.gradle b/crypto/algorithms/build.gradle
@@ -40,7 +40,6 @@ dependencies {
   implementation 'org.hyperledger.besu:blake2bf'
   implementation 'com.google.guava:guava'
 
-  testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.junit.jupiter:junit-jupiter'
 

diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/ECPointUtilTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/ECPointUtilTest.java
@@ -20,7 +20,7 @@
 import java.security.spec.ECPoint;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ECPointUtilTest {
 

diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/HashTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/HashTest.java
@@ -19,7 +19,7 @@
 
 import org.apache.tuweni.bytes.Bytes;
 import org.bouncycastle.util.encoders.Hex;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class HashTest {
 

diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/KeyPairTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/KeyPairTest.java
@@ -28,8 +28,8 @@
 import org.bouncycastle.asn1.x9.X9ECParameters;
 import org.bouncycastle.crypto.params.ECDomainParameters;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class KeyPairTest {
   public static final String ALGORITHM = SignatureAlgorithm.ALGORITHM;
@@ -39,7 +39,7 @@ public class KeyPairTest {
   public static KeyPairGenerator keyPairGenerator;
   public static ECDomainParameters curve;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() {
     Security.addProvider(new BouncyCastleProvider());
 

diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/KeyPairUtilTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/KeyPairUtilTest.java
@@ -19,7 +19,7 @@
 
 import java.io.File;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class KeyPairUtilTest {
 

diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECP256K1Test.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECP256K1Test.java
@@ -28,9 +28,9 @@
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
-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 SECP256K1Test {
 
@@ -39,15 +39,15 @@ public class SECP256K1Test {
   protected static String suiteStartTime = null;
   protected static String suiteName = null;
 
-  @BeforeClass
+  @BeforeAll
   public static void setTestSuiteStartTime() {
     suiteStartTime =
         LocalDateTime.now(ZoneId.systemDefault())
             .format(DateTimeFormatter.ofPattern("yyyyMMdd-HHmmss"));
     suiteName(SECP256K1Test.class);
   }
 
-  @Before
+  @BeforeEach
   public void setUp() {
     secp256K1 = new SECP256K1();
   }

diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECP256R1Test.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECP256R1Test.java
@@ -29,9 +29,9 @@
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
-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 SECP256R1Test {
 
@@ -103,7 +103,7 @@ public class SECP256R1Test {
   protected static String suiteStartTime = null;
   protected static String suiteName = null;
 
-  @BeforeClass
+  @BeforeAll
   public static void setTestSuiteStartTime() {
     suiteStartTime =
         LocalDateTime.now(ZoneId.systemDefault())
@@ -113,7 +113,7 @@ public static void setTestSuiteStartTime() {
     SignatureAlgorithmFactory.setInstance(SignatureAlgorithmType.create("secp256r1"));
   }
 
-  @Before
+  @BeforeEach
   public void setUp() {
     secp256R1 = new SECP256R1();
   }

diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPPrivateKeyTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPPrivateKeyTest.java
@@ -29,8 +29,8 @@
 import org.bouncycastle.asn1.sec.SECNamedCurves;
 import org.bouncycastle.asn1.x9.X9ECParameters;
 import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class SECPPrivateKeyTest {
   public static final String ALGORITHM = SignatureAlgorithm.ALGORITHM;
@@ -40,7 +40,7 @@ public class SECPPrivateKeyTest {
   protected static String suiteName = null;
   public static ECDomainParameters curve;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() {
     suiteStartTime =
         LocalDateTime.now(ZoneId.systemDefault())

diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPPublicKeyTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPPublicKeyTest.java
@@ -24,16 +24,16 @@
 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.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class SECPPublicKeyTest {
   public static final String ALGORITHM = SignatureAlgorithm.ALGORITHM;
   public static final String CURVE_NAME = "secp256k1";
 
   public ECDomainParameters curve;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     final X9ECParameters params = SECNamedCurves.getByName(CURVE_NAME);
     curve = new ECDomainParameters(params.getCurve(), params.getG(), params.getN(), params.getH());

diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPSignatureTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPSignatureTest.java
@@ -22,15 +22,15 @@
 import org.bouncycastle.asn1.sec.SECNamedCurves;
 import org.bouncycastle.asn1.x9.X9ECParameters;
 import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class SECPSignatureTest {
   public static final String CURVE_NAME = "secp256k1";
 
   public static BigInteger curveOrder;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUp() {
     final X9ECParameters params = SECNamedCurves.getByName(CURVE_NAME);
     final ECDomainParameters curve =

diff --git a/...o/algorithms/src/test/java/org/hyperledger/besu/crypto/SignatureAlgorithmFactoryTest.java b/...o/algorithms/src/test/java/org/hyperledger/besu/crypto/SignatureAlgorithmFactoryTest.java
@@ -17,12 +17,12 @@
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class SignatureAlgorithmFactoryTest {
 
-  @Before
+  @BeforeEach
   public void setUp() {
     SignatureAlgorithmFactory.resetInstance();
   }

diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SignatureAlgorithmTypeTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SignatureAlgorithmTypeTest.java
@@ -17,7 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SignatureAlgorithmTypeTest {
   @Test

diff --git a/...algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PairerTest.java b/...algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PairerTest.java
@@ -18,7 +18,7 @@
 
 import java.math.BigInteger;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Adapted from the pc_ecc (Apache 2 License) implementation:

diff --git a/.../algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PointTest.java b/.../algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PointTest.java
@@ -18,7 +18,7 @@
 
 import java.math.BigInteger;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Adapted from the pc_ecc (Apache 2 License) implementation:

diff --git a/...o/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2PointTest.java b/...o/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2PointTest.java
@@ -18,7 +18,7 @@
 
 import java.math.BigInteger;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Adapted from the pc_ecc (Apache 2 License) implementation:

diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128PointTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128PointTest.java
@@ -18,7 +18,7 @@
 
 import java.math.BigInteger;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Adapted from the pc_ecc (Apache 2 License) implementation:

diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq12Test.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq12Test.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Adapted from the pc_ecc (Apache 2 License) implementation:

diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq2Test.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq2Test.java
@@ -18,7 +18,7 @@
 
 import java.math.BigInteger;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Adapted from the pc_ecc (Apache 2 License) implementation:

diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/FqTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/FqTest.java
@@ -18,7 +18,7 @@
 
 import java.math.BigInteger;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Adapted from the pc_ecc (Apache 2 License) implementation:

diff --git a/docker/openjdk-17-debug/Dockerfile b/docker/openjdk-17-debug/Dockerfile
@@ -35,11 +35,9 @@ ENV BESU_GRAPHQL_HTTP_HOST 0.0.0.0
 ENV BESU_METRICS_HOST 0.0.0.0
 ENV BESU_JMX_HOST 0.0.0.0
 ENV BESU_PID_PATH "/tmp/pid"
-ENV BESU_HOST_ALLOWLIST "*"
 
 #debug options for maximum observability
 ENV BESU_LOGGING "INFO"
-ENV BESU_RPC_HTTP_API  "ETH,NET,TRACE,DEBUG,ADMIN,TXPOOL"
 ENV JDWP_OPTS "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005"
 ENV JAVA_OPTS "${JDWP_OPTS} "
 

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -3989,6 +3989,11 @@
             <sha256 value="5f7e01a94adbd52546c0d03af525697197165e36b73d914c6a05e3aab8905e6e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.eclipse.platform" name="org.eclipse.core.expressions" version="3.9.200">
+         <artifact name="org.eclipse.core.expressions-3.9.200.pom">
+            <sha256 value="74e5f0e9f0d7fc442396ca959e738d1ad9b622e945ad3cd9a323bb8cdfea9826" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.eclipse.platform" name="org.eclipse.core.filesystem" version="1.9.100">
          <artifact name="org.eclipse.core.filesystem-1.9.100.jar">
             <sha256 value="36e802c4d9a2c864e7d6b22b8d06f59927d113475ea04b3fd9bf6312d5a97ff6" origin="Generated by Gradle"/>
@@ -4082,6 +4087,11 @@
             <sha256 value="e6a79e8bc53281ecbe3433a52c713b75ba8fa06e03b9f279b027f68ba078085e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.eclipse.platform" name="org.eclipse.swt" version="3.124.200">
+         <artifact name="org.eclipse.swt-3.124.200.pom">
+            <sha256 value="4d87cb2d94dab15fba1564ae574b60988939c76176d86882847332dcea6a3f77" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.eclipse.platform" name="org.eclipse.text" version="3.12.0">
          <artifact name="org.eclipse.text-3.12.0.jar">
             <sha256 value="457c1f8af07e870acce65130a2d9aa1e0fd95c92a7667bbd2db5bf7f9f19dd31" origin="Generated by Gradle"/>