merge

Signed-off-by: Sally MacFarlane <[email protected]>

Author: macfarla

.github/workflows/BesuContainerVerify.sh

@@ -38,7 +38,7 @@ fi
 _SUCCESS=false
 while [[ ${_SUCCESS} != "true" && $RETRY -gt 0 ]]
 do
-  docker logs ${CONTAINER_NAME} | grep -q "Ethereum main loop is up" && {
+  docker logs ${CONTAINER_NAME} 2>&1 | grep -q "Ethereum main loop is up" && {
     _SUCCESS=true
     continue
   }

.github/workflows/develop-pr.yml

@@ -73,10 +73,6 @@ jobs:
         uses: gradle/actions/setup-gradle@9e899d11ad247ec76be7a60bc1cf9d3abbb9e7f1
         with:
           cache-disabled: true
-      - name: install goss
-        run: |
-          mkdir -p docker/reports
-          curl -L https://github.com/aelsabbahy/goss/releases/download/v0.4.4/goss-${{ steps.prep.outputs.PLATFORM_PAIR }} -o ./docker/tests/goss-${{ steps.prep.outputs.PLATFORM_PAIR }}
       - name: build and test docker
         uses: gradle/actions/setup-gradle@9e899d11ad247ec76be7a60bc1cf9d3abbb9e7f1
         env:

.github/workflows/develop.yml

@@ -72,10 +72,6 @@ jobs:
         uses: gradle/actions/setup-gradle@9e899d11ad247ec76be7a60bc1cf9d3abbb9e7f1
         with:
           cache-disabled: true
-      - name: install goss
-        run: |
-          mkdir -p docker/reports
-          curl -L https://github.com/aelsabbahy/goss/releases/download/v0.4.4/goss-${{ steps.prep.outputs.PLATFORM_PAIR }} -o ./docker/tests/goss-${{ steps.prep.outputs.PLATFORM_PAIR }}
       - name: login to ${{ env.registry }}
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
         with:

.github/workflows/draft-release.yml

@@ -226,11 +226,6 @@ jobs:
         with:
           cache-disabled: true
 
-      - name: install goss
-        run: |
-          mkdir -p docker/reports
-          curl -L https://github.com/aelsabbahy/goss/releases/download/v0.4.4/goss-${{ steps.prep.outputs.PLATFORM_PAIR }} -o ./docker/tests/goss-${{ steps.prep.outputs.PLATFORM_PAIR }}
-
       - name: login to ${{ env.registry }}
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
         with:

.github/workflows/stale-issues.yml

@@ -11,7 +11,7 @@ jobs:
       pull-requests: write
       contents: write
     steps:
-      - uses: actions/stale@v10.1.0
+      - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008
         with:
           days-before-issue-stale: 180
           days-before-issue-close: 14

.gitignore

@@ -19,6 +19,7 @@
 .settings
 .springBeans
 .vertx
+.profileconfig.json
 bin/
 local.properties
 target/
@@ -32,3 +33,4 @@ site/
 jitpack.yml
 /ethereum/eth/src/test/resources/tx.csv.gz
 **/**/.factorypath
+**/**/.jqwik-database

CHANGELOG.md

@@ -3,8 +3,29 @@
 ## Unreleased
 
 ### Breaking Changes
+- Remove these deprecated CLI options [#9385](https://github.com/hyperledger/besu/pull/9385)
+  - Remove`--Xbonsai-parallel-tx-processing-enabled` deprecated since 25.7.0. Use `--bonsai-parallel-tx-processing-enabled` instead.
+  - Remove `--Xsnapsync-server-enabled` deprecated since 25.7.0. Use `--snapsync-server-enabled` instead.
+  - Remove `--Xsnapsync-synchronizer-pre-merge-headers-only-enabled` deprecated since 25.7.0. Use `--snapsync-synchronizer-pre-checkpoint-headers-only-enabled` instead.
+  - Remove `--Xhistory-expiry-prune` deprecated since 25.7.0. Use `--history-expiry-prune` instead.
 - eth_createAccessList now returns success result if execution reverted [#9358](https://github.com/hyperledger/besu/pull/9358)
 
+### Upcoming Breaking Changes
+- Sunsetting features - for more context on the reasoning behind the deprecation of these features, including alternative options, read [this blog post](https://www.lfdecentralizedtrust.org/blog/sunsetting-tessera-and-simplifying-hyperledger-besu)
+  - Proof of Work consensus (PoW)
+  - Fast Sync
+
+### Additions and Improvements
+- Update to vertx 4.5.22 [#9375](https://github.com/hyperledger/besu/pull/9375)
+- Add `opcodes` optional parameter to RPC methods: `debug_standardTraceBlockToFile`, `debug_standardTraceBadBlockToFile`, `debug_traceBlockByNumber`, `debug_traceBlockByHash`, `debug_traceTransaction`, `debug_traceBlock`, `debug_traceCall` for tracing specified opcodes [#9335](https://github.com/hyperledger/besu/pull/9335)
+- eth_createAccessList now returns success result if execution reverted [#9358](https://github.com/hyperledger/besu/pull/9358)
+
+### Bug fixes
+
+## 25.11.0
+
+### Breaking Changes
+
 ### Upcoming Breaking Changes
 - Deprecated CLI options
   - `--Xbonsai-parallel-tx-processing-enabled` is deprecated since 25.7.0. Use `--bonsai-parallel-tx-processing-enabled` instead.
@@ -16,13 +37,13 @@
   - Fast Sync
 
 ### Additions and Improvements
+- Add Osaka, BPO1 and BPO2 fork times for mainnet [#9380](https://github.com/hyperledger/besu/pull/9380)
 - Add blockTimestamp to receipt logs for `eth_getBlockReceipts` and `eth_getTransactionReceipt` results [#9294](https://github.com/hyperledger/besu/pull/9294)
 - Upgrade to execution-spec-tests v5.3.0 [#9301](https://github.com/hyperledger/besu/pull/9301)
 - Update to netty 4.2.7.Final [#9330](https://github.com/hyperledger/besu/pull/9330)
 - Ability to enable/disable stack, storage and returnData tracing data in debug_traceStandardBlockToFile and debug_traceStandardBadBlockToFile endpoints [#9183](https://github.com/hyperledger/besu/pull/9183)
 - Increase mainnet gas limit to 60M [#9339](https://github.com/hyperledger/besu/pull/9339)
 - Update to tuweni 2.7.2 [#9338](https://github.com/hyperledger/besu/pull/9338)
-- eth_createAccessList now returns success result if execution reverted [#9358](https://github.com/hyperledger/besu/pull/9358)
 
 ### Bug fixes
 

acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/TestBesuEventsPlugin.java

@@ -16,6 +16,7 @@
 
 import org.hyperledger.besu.plugin.BesuPlugin;
 import org.hyperledger.besu.plugin.ServiceManager;
+import org.hyperledger.besu.plugin.data.AddedBlockContext;
 import org.hyperledger.besu.plugin.data.BlockHeader;
 import org.hyperledger.besu.plugin.data.PropagatedBlockContext;
 import org.hyperledger.besu.plugin.services.BesuEvents;
@@ -37,8 +38,10 @@ public class TestBesuEventsPlugin implements BesuPlugin {
 
   private ServiceManager context;
 
-  private Optional<Long> subscriptionId;
-  private final AtomicInteger blockCounter = new AtomicInteger();
+  private Optional<Long> propagationSubscriptionId;
+  private Optional<Long> addedSubscriptionId;
+  private final AtomicInteger propagatedBlockCounter = new AtomicInteger();
+  private final AtomicInteger addedBlockCounter = new AtomicInteger();
   private File callbackDir;
 
   @Override
@@ -50,26 +53,37 @@ public void register(final ServiceManager context) {
 
   @Override
   public void start() {
-    subscriptionId =
+    propagationSubscriptionId =
         context
             .getService(BesuEvents.class)
             .map(events -> events.addBlockPropagatedListener(this::onBlockAnnounce));
-    LOG.info("Listening with ID#" + subscriptionId);
+    LOG.info("Listening with propagation ID#" + propagationSubscriptionId);
+    addedSubscriptionId =
+        context
+            .getService(BesuEvents.class)
+            .map(events -> events.addBlockAddedListener(this::onBlockAdded));
+    LOG.info("Listening with added ID#" + addedSubscriptionId);
   }
 
   @Override
   public void stop() {
-    subscriptionId.ifPresent(
+    propagationSubscriptionId.ifPresent(
         id ->
             context
                 .getService(BesuEvents.class)
                 .ifPresent(besuEvents -> besuEvents.removeBlockPropagatedListener(id)));
-    LOG.info("No longer listening with ID#" + subscriptionId);
+    LOG.info("No longer listening propagation with ID#" + propagationSubscriptionId);
+    addedSubscriptionId.ifPresent(
+        id ->
+            context
+                .getService(BesuEvents.class)
+                .ifPresent(besuEvents -> besuEvents.removeBlockAddedListener(id)));
+    LOG.info("No longer listening added with ID#" + addedSubscriptionId);
   }
 
   private void onBlockAnnounce(final PropagatedBlockContext propagatedBlockContext) {
     final BlockHeader header = propagatedBlockContext.getBlockHeader();
-    final int blockCount = blockCounter.incrementAndGet();
+    final int blockCount = propagatedBlockCounter.incrementAndGet();
     LOG.info("I got a new block! (I've seen {}) - {}", blockCount, header);
     try {
       final File callbackFile = new File(callbackDir, "newBlock." + blockCount);
@@ -83,4 +97,27 @@ private void onBlockAnnounce(final PropagatedBlockContext propagatedBlockContext
       throw new RuntimeException(ioe);
     }
   }
+
+  private void onBlockAdded(final AddedBlockContext addedBlockContext) {
+    final BlockHeader header = addedBlockContext.getBlockHeader();
+    final int blockCount = addedBlockCounter.incrementAndGet();
+    LOG.info(
+        "New block added! (I've seen {}) - {}, eventType {}",
+        blockCount,
+        header,
+        addedBlockContext.getEventType());
+    try {
+      final File callbackFile = new File(callbackDir, "addedBlock." + blockCount);
+      if (!callbackFile.getParentFile().exists()) {
+        callbackFile.getParentFile().mkdirs();
+        callbackFile.getParentFile().deleteOnExit();
+      }
+      Files.write(
+          callbackFile.toPath(),
+          Collections.singletonList(addedBlockContext.getEventType().name()));
+      callbackFile.deleteOnExit();
+    } catch (final IOException ioe) {
+      throw new RuntimeException(ioe);
+    }
+  }
 }

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BesuEventsPluginTest.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright contributors to Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.plugins;
+
+import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationFactory;
+
+import java.util.Collections;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class BesuEventsPluginTest extends AcceptanceTestBase {
+  private BesuNode pluginNode;
+  private BesuNode minerNode;
+
+  @BeforeEach
+  public void setUp() throws Exception {
+    minerNode =
+        besu.createQbftNode(
+            "minerNode",
+            b ->
+                b.genesisConfigProvider(
+                    GenesisConfigurationFactory::createQbftLondonGenesisConfig));
+    pluginNode =
+        besu.createQbftPluginsNode(
+            "node1", Collections.singletonList("testPlugins"), Collections.emptyList());
+    cluster.start(pluginNode, minerNode);
+  }
+
+  @Test
+  public void blockIsAdded() {
+    waitForFile(pluginNode.homeDirectory().resolve("plugins/addedBlock.2"));
+  }
+}

app/src/main/java/org/hyperledger/besu/cli/BesuCommand.java

@@ -771,16 +771,6 @@ protected BesuCommand(
     this.transactionValidatorServiceImpl = transactionValidatorServiceImpl;
   }
 
-  /**
-   * Parse Besu command line arguments. Visible for testing.
-   *
-   * @param resultHandler execution strategy. See PicoCLI. Typical argument is RunLast.
-   * @param parameterExceptionHandler Exception handler for handling parameters
-   * @param executionExceptionHandler Exception handler for business logic
-   * @param in Standard input stream
-   * @param args arguments to Besu command
-   * @return success or failure exit code.
-   */
   /**
    * Parses command line arguments and configures the application accordingly.
    *
@@ -792,6 +782,7 @@ protected BesuCommand(
    * @param args The command line arguments.
    * @return The execution result status code.
    */
+  @VisibleForTesting
   public int parse(
       final IExecutionStrategy resultHandler,
       final BesuParameterExceptionHandler parameterExceptionHandler,