Merge branch 'main' of github.com:hyperledger/besu into implement-tracing-by-opcode

Author: macfarla

CHANGELOG.md

@@ -15,6 +15,26 @@
   - Fast Sync
 
 ### Additions and Improvements
+- Update to vertx 4.5.22 [#9375](https://github.com/hyperledger/besu/pull/9375)
+
+### 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.
+  - `--Xsnapsync-server-enabled` is deprecated since 25.7.0. Use `--snapsync-server-enabled` instead.
+  - `--Xsnapsync-synchronizer-pre-merge-headers-only-enabled` is deprecated since 25.7.0. Use `--snapsync-synchronizer-pre-checkpoint-headers-only-enabled` instead.
+  - `--Xhistory-expiry-prune` is deprecated since 25.7.0. Use `--history-expiry-prune` instead.
+- 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
+- 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)

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/controller/BesuControllerBuilder.java

@@ -1349,29 +1349,22 @@ protected List<PeerValidator> createPeerValidators(
     if (daoBlock.isPresent()) {
       // Setup dao validator
       validators.add(
-          new DaoForkPeerValidator(
-              protocolSchedule, peerTaskExecutor, syncConfig, metricsSystem, daoBlock.getAsLong()));
+          new DaoForkPeerValidator(protocolSchedule, peerTaskExecutor, daoBlock.getAsLong()));
     }
 
     final OptionalLong classicBlock = genesisConfigOptions.getClassicForkBlock();
     // setup classic validator
     if (classicBlock.isPresent()) {
       validators.add(
           new ClassicForkPeerValidator(
-              protocolSchedule,
-              peerTaskExecutor,
-              syncConfig,
-              metricsSystem,
-              classicBlock.getAsLong()));
+              protocolSchedule, peerTaskExecutor, classicBlock.getAsLong()));
     }
 
     for (final Map.Entry<Long, Hash> requiredBlock : requiredBlocks.entrySet()) {
       validators.add(
           new RequiredBlocksPeerValidator(
               protocolSchedule,
               peerTaskExecutor,
-              syncConfig,
-              metricsSystem,
               requiredBlock.getKey(),
               requiredBlock.getValue()));
     }

app/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java

@@ -249,8 +249,6 @@ protected List<PeerValidator> createPeerValidators(
           new RequiredBlocksPeerValidator(
               protocolSchedule,
               peerTaskExecutor,
-              syncConfig,
-              metricsSystem,
               powTerminalBlockNumber.getAsLong(),
               powTerminalBlockHash.get(),
               0));

app/src/main/java/org/hyperledger/besu/services/BesuEventsImpl.java

@@ -29,6 +29,7 @@
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.evm.log.LogTopic;
 import org.hyperledger.besu.plugin.data.AddedBlockContext;
+import org.hyperledger.besu.plugin.data.AddedBlockContext.EventType;
 import org.hyperledger.besu.plugin.data.BlockHeader;
 import org.hyperledger.besu.plugin.data.PropagatedBlockContext;
 import org.hyperledger.besu.plugin.services.BesuEvents;
@@ -88,6 +89,7 @@ public long addBlockAddedListener(final BlockAddedListener listener) {
         event ->
             listener.onBlockAdded(
                 blockAddedContext(
+                    event.getEventType(),
                     event::getHeader,
                     () -> event.getBlock().getBody(),
                     event::getTransactionReceipts)));
@@ -104,6 +106,7 @@ public long addBlockReorgListener(final BlockReorgListener listener) {
         (blockWithReceipts, chain) ->
             listener.onBlockReorg(
                 blockAddedContext(
+                    EventType.CHAIN_REORG,
                     blockWithReceipts::getHeader,
                     blockWithReceipts.getBlock()::getBody,
                     blockWithReceipts::getReceipts)));
@@ -210,6 +213,7 @@ public UInt256 getTotalDifficulty() {
   }
 
   private static AddedBlockContext blockAddedContext(
+      final EventType eventType,
       final Supplier<BlockHeader> blockHeaderSupplier,
       final Supplier<BlockBody> blockBodySupplier,
       final Supplier<List<TransactionReceipt>> transactionReceiptsSupplier) {
@@ -228,6 +232,11 @@ public BlockBody getBlockBody() {
       public List<TransactionReceipt> getTransactionReceipts() {
         return transactionReceiptsSupplier.get();
       }
+
+      @Override
+      public EventType getEventType() {
+        return eventType;
+      }
     };
   }
 }

app/src/main/java/org/hyperledger/besu/services/BlockchainServiceImpl.java

@@ -19,6 +19,7 @@
 import org.hyperledger.besu.datatypes.BlobGas;
 import org.hyperledger.besu.datatypes.HardforkId;
 import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Transaction;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
@@ -136,6 +137,11 @@ public Wei getBlobGasPrice(final BlockHeader blockHeader) {
                 .orElse(BlobGas.ZERO));
   }
 
+  @Override
+  public Optional<Transaction> getTransactionByHash(final Hash transactionHash) {
+    return blockchain.getTransactionByHash(transactionHash).map(Transaction.class::cast);
+  }
+
   @Override
   public Optional<List<TransactionReceipt>> getReceiptsByBlockHash(final Hash blockHash) {
     return blockchain

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

@@ -115,8 +115,11 @@ public static Collection<Object[]> parameters() {
               new ForkId(Bytes.ofUnsignedInt(0xf0afd0e3L), 1681338455L),
               new ForkId(Bytes.ofUnsignedInt(0xdce96c2dL), 1710338135L),
               new ForkId(Bytes.ofUnsignedInt(0x9f3d2254L), 1746612311L),
-              new ForkId(Bytes.ofUnsignedInt(0xc376cf8bL), 0L),
-              new ForkId(Bytes.ofUnsignedInt(0xc376cf8bL), 0L))
+              new ForkId(Bytes.ofUnsignedInt(0xc376cf8bL), 1764798551),
+              new ForkId(Bytes.ofUnsignedInt(0x5167e2a6L), 1765290071),
+              new ForkId(Bytes.ofUnsignedInt(0xcba2a1c0L), 1767747671),
+              new ForkId(Bytes.ofUnsignedInt(0x07c9462eL), 0),
+              new ForkId(Bytes.ofUnsignedInt(0x07c9462eL), 0))
         },
         new Object[] {
           NetworkName.MORDOR,

app/src/test/java/org/hyperledger/besu/cli/NatOptionsTest.java

@@ -21,7 +21,6 @@
 
 import org.hyperledger.besu.nat.NatMethod;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
@@ -81,7 +80,6 @@ public void natMethodFallbackEnabledPropertyIsCorrectlyUpdatedWithDocker() {
     assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
-  @Disabled("flaky test see https://github.com/hyperledger/besu/issues/8775")
   @Test
   public void natMethodFallbackEnabledPropertyIsCorrectlyUpdatedWithUpnp() {
 

app/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java

@@ -284,6 +284,7 @@ public void addedBlockEventFiresAfterSubscribe() {
     assertThat(result.get()).isNotNull();
     assertThat(result.get().getBlockHeader()).isEqualTo(block.getHeader());
     assertThat(result.get().getTransactionReceipts()).isEqualTo(transactionReceipts);
+    assertThat(result.get().getEventType()).isEqualTo(AddedBlockContext.EventType.HEAD_ADVANCED);
   }
 
   @Test