From c2d1b7de557ba149c0793768bffaad2811debce2 Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Tue, 5 Dec 2023 17:40:52 +0100 Subject: [PATCH 1/4] Deprecation warning if Forest pruning is enabled (#6230) Signed-off-by: Fabio Di Fabio --- CHANGELOG.md | 13 +++++++++++++ .../org/hyperledger/besu/cli/BesuCommand.java | 5 +++++ .../org/hyperledger/besu/cli/BesuCommandTest.java | 15 +++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b2607eed4e..927fbf2f90d 100644 --- 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 index 91ef840d62e..a4045cee1c5 100644 --- 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/test/java/org/hyperledger/besu/cli/BesuCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java index 85586871483..0df397af71f 100644 --- 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"); From eeebe4da2752b16412593235c3b22a17d62206ab Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Tue, 5 Dec 2023 23:35:33 +0100 Subject: [PATCH 2/4] Fix the annoying "Errors occurred while build effective model" during builds (#6241) Signed-off-by: Fabio Di Fabio --- gradle/versions.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 34a56730ee0..f239370ab7a 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -15,6 +15,7 @@ dependencyManagement { dependencies { + applyMavenExclusions = false dependencySet(group: 'org.antlr', version: '4.11.1') { entry 'antlr4' From 254dd6d8c09efd7f01982499993a6eecb53cfd3b Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Wed, 6 Dec 2023 17:28:33 +1100 Subject: [PATCH 3/4] Run ATs sequentially (#6244) Signed-off-by: Gabriel Fukushima --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index d91ccb64d0a..bff2f447944 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -424,9 +424,11 @@ workflows: - acceptanceTestsCliqueBft: requires: - assemble + - acceptanceTests - acceptanceTestsPermissioning: requires: - assemble + - acceptanceTestsCliqueBft - buildDocker: requires: - assemble From 2513088db5d648ceff5c9ed90a041afe95076ba5 Mon Sep 17 00:00:00 2001 From: delehef Date: Wed, 6 Dec 2023 13:06:17 +0100 Subject: [PATCH 4/4] fix: double calls to trace{Start,End}Transaction (#6247) Signed-off-by: Franklin Delehelle --- .../hyperledger/besu/services/TraceServiceImpl.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/besu/src/main/java/org/hyperledger/besu/services/TraceServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/TraceServiceImpl.java index 98c233197f3..02fff10d2fb 100644 --- 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 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 trace( false, blobGasPrice); - long transactionGasUsed = transaction.getGasLimit() - result.getGasRemaining(); - tracer.traceEndTransaction( - worldUpdater, - transaction, - result.isSuccessful(), - result.getOutput(), - result.getLogs(), - transactionGasUsed, - 0); - results.add(result); });