Merge branch 'main' into bal-perfect-parallel

Author: matkt

CHANGELOG.md

@@ -14,6 +14,8 @@
     - Fast Sync
 
 ### Additions and Improvements
+- Performance: Optimise EIP-196 AltBn128: EcAdd 33-128% faster, EcMul 8% faster [#9570](https://github.com/hyperledger/besu/pull/9570)
+- Update to Netty 4.2.9.Final [#9587](https://github.com/hyperledger/besu/pull/9587)
 
 ##  25.12.0
 
@@ -48,6 +50,7 @@
 - Add Linea named networks for `linea_mainnet` and `linea_sepolia` [#9436](https://github.com/hyperledger/besu/pull/9436), [#9518](https://github.com/hyperledger/besu/pull/9518)
 - Add `eth_subscribe` and `eth_unsubscribe` support to IPC service [#9504](https://github.com/hyperledger/besu/pull/9504)
 - Add experimental `callTracer` tracer option to `debug_trace*` methods. Enabled using `--Xenable-extra-debug-tracers=true` option. Issue [#8326][issue_8326] implemented via PR [#8960][PR_8960] and [#9072][PR_9072].
+- Remove EOF [#9559](https://github.com/hyperledger/besu/pull/9559)
 
 ### Bug fixes
 - Fix non-deterministic sub-protocol registration during IBFT2 to QBFT consensus migration [#9516](https://github.com/hyperledger/besu/pull/9516)

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java

@@ -44,6 +44,7 @@
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.miner.MinerTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.NetTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermissioningTransactions;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.plugins.PluginsTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.txpool.TxPoolTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.web3.Web3Transactions;
 
@@ -104,6 +105,7 @@ public class AcceptanceTestBase {
   protected final TxPoolTransactions txPoolTransactions;
   protected final ExitedWithCode exitedSuccessfully;
   protected final DebugTransactions debug;
+  protected final PluginsTransactions plugins;
 
   private final ExecutorService outputProcessorExecutor = Executors.newCachedThreadPool();
 
@@ -134,6 +136,7 @@ protected AcceptanceTestBase() {
     permissionedNodeBuilder = new PermissionedNodeBuilder();
     exitedSuccessfully = new ExitedWithCode(0);
     debug = new DebugTransactions();
+    plugins = new PluginsTransactions();
   }
 
   @BeforeEach

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java

@@ -50,6 +50,7 @@
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.miner.MinerRequestFactory;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.CustomRequestFactory;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.plugins.PluginsRequestFactory;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.txpool.TxPoolRequestFactory;
 
 import java.io.File;
@@ -452,7 +453,8 @@ public NodeRequests nodeRequests() {
               new TxPoolRequestFactory(web3jService),
               new DebugRequestFactory(web3jService),
               websocketService,
-              loginRequestFactory());
+              loginRequestFactory(),
+              new PluginsRequestFactory(web3jService));
     }
 
     return nodeRequests;

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java

@@ -46,7 +46,7 @@
 import org.hyperledger.besu.ethereum.core.encoding.BlockBodyEncoder;
 import org.hyperledger.besu.ethereum.core.encoding.BlockHeaderEncoder;
 import org.hyperledger.besu.ethereum.core.encoding.receipt.TransactionReceiptEncoder;
-import org.hyperledger.besu.ethereum.core.plugins.PluginConfiguration;
+import org.hyperledger.besu.ethereum.core.plugins.ImmutablePluginConfiguration;
 import org.hyperledger.besu.ethereum.core.plugins.PluginInfo;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
@@ -646,9 +646,9 @@ public void loadPluginContext(
       besuPluginContext.addService(PermissioningService.class, permissioningService);
 
       besuPluginContext.initialize(
-          new PluginConfiguration.Builder()
+          ImmutablePluginConfiguration.builder()
               .pluginsDir(pluginsPath)
-              .requestedPlugins(requestedPlugins.stream().map(PluginInfo::new).toList())
+              .requestedPluginsInfo(requestedPlugins.stream().map(PluginInfo::new).toList())
               .build());
       besuPluginContext.registerPlugins();
       commandLine.parseArgs(extraCLIOptions.toArray(new String[0]));

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/NodeRequests.java

@@ -22,6 +22,7 @@
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.miner.MinerRequestFactory;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.CustomRequestFactory;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermissioningJsonRpcRequestFactory;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.plugins.PluginsRequestFactory;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.txpool.TxPoolRequestFactory;
 
 import java.util.Optional;
@@ -43,6 +44,7 @@ public class NodeRequests {
   private final MinerRequestFactory miner;
   private final TxPoolRequestFactory txPool;
   private final DebugRequestFactory debug;
+  private final PluginsRequestFactory plugins;
 
   public NodeRequests(
       final Web3jService web3jService,
@@ -56,7 +58,8 @@ public NodeRequests(
       final TxPoolRequestFactory txPool,
       final DebugRequestFactory debug,
       final Optional<WebSocketService> websocketService,
-      final LoginRequestFactory login) {
+      final LoginRequestFactory login,
+      final PluginsRequestFactory plugins) {
     this.web3jService = web3jService;
     this.netEth = netEth;
     this.clique = clique;
@@ -69,6 +72,7 @@ public NodeRequests(
     this.debug = debug;
     this.websocketService = websocketService;
     this.login = login;
+    this.plugins = plugins;
   }
 
   public Web3j eth() {
@@ -115,6 +119,10 @@ public DebugRequestFactory debug() {
     return debug;
   }
 
+  public PluginsRequestFactory plugins() {
+    return plugins;
+  }
+
   public void shutdown() {
     netEth.shutdown();
     websocketService.ifPresent(WebSocketService::close);

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/plugins/PluginsRequestFactory.java

@@ -0,0 +1,42 @@
+/*
+ * 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.dsl.transaction.plugins;
+
+import java.util.Collections;
+import java.util.Optional;
+
+import org.web3j.protocol.Web3jService;
+import org.web3j.protocol.core.Request;
+import org.web3j.protocol.core.Response;
+
+public class PluginsRequestFactory {
+
+  public static class ReloadConfigurationResponse extends Response<String> {}
+
+  private final Web3jService web3jService;
+
+  public PluginsRequestFactory(final Web3jService web3jService) {
+    this.web3jService = web3jService;
+  }
+
+  public Request<?, ReloadConfigurationResponse> reloadConfiguration(
+      final Optional<String> maybePluginName) {
+    return new Request<>(
+        "plugins_reloadPluginConfig",
+        maybePluginName.map(Collections::singletonList).orElse(Collections.emptyList()),
+        web3jService,
+        ReloadConfigurationResponse.class);
+  }
+}

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/plugins/PluginsTransactions.java

@@ -0,0 +1,26 @@
+/*
+ * 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.dsl.transaction.plugins;
+
+public class PluginsTransactions {
+
+  public ReloadPluginConfig reloadConfiguration(final String pluginName) {
+    return new ReloadPluginConfig(pluginName);
+  }
+
+  public ReloadPluginConfig reloadConfiguration() {
+    return new ReloadPluginConfig();
+  }
+}

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/plugins/ReloadPluginConfig.java

@@ -0,0 +1,51 @@
+/*
+ * 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.dsl.transaction.plugins;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import org.web3j.protocol.core.Response;
+
+public class ReloadPluginConfig implements Transaction<String> {
+
+  private final String pluginName;
+
+  public ReloadPluginConfig() {
+    this(null);
+  }
+
+  public ReloadPluginConfig(final String pluginName) {
+    this.pluginName = pluginName;
+  }
+
+  @Override
+  public String execute(final NodeRequests node) {
+    try {
+      final Response<String> resp =
+          node.plugins().reloadConfiguration(Optional.ofNullable(pluginName)).send();
+      assertThat(resp).isNotNull();
+      assertThat(resp.hasError()).isFalse();
+      return resp.getResult();
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}

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

@@ -0,0 +1,61 @@
+/*
+ * 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.plugin.BesuPlugin;
+import org.hyperledger.besu.plugin.ServiceManager;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+
+public abstract class AbstractTestReloadConfigurationPlugin implements BesuPlugin {
+  private File callbackDir;
+  private final int pluginNum;
+
+  public AbstractTestReloadConfigurationPlugin(final int pluginNum) {
+    this.pluginNum = pluginNum;
+  }
+
+  @Override
+  public void register(final ServiceManager serviceManager) {
+    callbackDir = new File(System.getProperty("besu.plugins.dir", "plugins"));
+  }
+
+  @Override
+  public void start() {}
+
+  @Override
+  public CompletableFuture<Void> reloadConfiguration() {
+    return CompletableFuture.runAsync(this::notifyConfigurationReloaded);
+  }
+
+  @Override
+  public void stop() {}
+
+  private void notifyConfigurationReloaded() {
+    try {
+      final File callbackFile = new File(callbackDir, "reloadConfiguration." + pluginNum);
+      if (!callbackFile.getParentFile().exists()) {
+        callbackFile.getParentFile().mkdirs();
+        callbackFile.getParentFile().deleteOnExit();
+      }
+      callbackFile.createNewFile();
+      callbackFile.deleteOnExit();
+    } catch (final IOException ioe) {
+      throw new RuntimeException(ioe);
+    }
+  }
+}