Merge branch 'main' into zkbesu

Signed-off-by: Gabriel-Trintinalia <[email protected]>

.github/ISSUE_TEMPLATE/release-checklist.md

@@ -11,11 +11,16 @@ assignees: ''
 - [ ] Update changelog if necessary, and merge a PR for it to main
   - [ ] Notify maintainers about updating changelog for in-flight PRs 
 - [ ] Optional: for hotfixes, create a release branch and cherry-pick, e.g. `release-<version>-hotfix`
-- [ ] Optional: create a PR into main from the hotfix branch to see the CI checks pass
+  - [ ] Optional: for hotfixes, create a PR into main from the hotfix branch to see the CI checks pass
 - [ ] On the appropriate branch/commit, create a calver tag for the release candidate, format example: `24.4.0-RC2`
-- [ ] Sign-off with team; confirm tag is correct in #besu-release in Discord
-- [ ] Consensys staff start burn-in using the proposed release <version-RCX> tag
-- [ ] Sign off burn-in; convey burn-in results in #besu-release in Discord
+  - [ ] git tag 24.4.0-RC2
+  - [ ] git push upstream 24.4.0-RC2
+- [ ] Sign-off with team; announce the tag in #besu-release in Discord
+  - [ ] Targeting this tag for the burn-in: https://github.com/hyperledger/besu/releases/tag/24.4.0-RC2
+- [ ] Consensys staff start burn-in using this tag
+- [ ] Seek sign off for burn-in
+  - [ ] Pass? Go ahead and complete the release process
+  - [ ] Fail? Put a message in #besu-release in Discord indicating the release will be aborted because it failed burn-in 
 - [ ] Using the same git sha, create a calver tag for the FULL RELEASE, example format `24.4.0`
 - [ ] Using the FULL RELEASE tag, create a release in github to trigger the workflows. Once published:
     - this is now public and notifies subscribed users
@@ -24,8 +29,9 @@ assignees: ''
     - publishes the docker `latest` tag variants
 - [ ] Check binary SHAs are correct on the release page
 - [ ] Check "Container Verify" GitHub workflow has run successfully
-- [ ] Create homebrew release - run https://github.com/hyperledger/homebrew-besu/actions/workflows/update-version.yml
 - [ ] Create besu-docs release - https://github.com/hyperledger/besu-docs/releases/new
-   - Copy release notes from besu
-   - If publishing the release in github doesn't automatically trigger this workflow, then manually run https://github.com/hyperledger/besu-docs/actions/workflows/update-version.yml
+  - Copy release notes from besu
+  - If publishing the release in github doesn't automatically trigger this workflow, then manually run https://github.com/hyperledger/besu-docs/actions/workflows/update-version.yml
+- [ ] Create homebrew release - run GHA workflow directly https://github.com/hyperledger/homebrew-besu/actions/workflows/update-version.yml
+- [ ] Delete the burn-in nodes (unless required for further analysis eg performance)
 - [ ] Social announcements

CHANGELOG.md

@@ -17,12 +17,15 @@
 - In process RPC service [#7395](https://github.com/hyperledger/besu/pull/7395)
 - Added support for tracing private transactions using `priv_traceTransaction` API. [#6161](https://github.com/hyperledger/besu/pull/6161)
 - Wrap WorldUpdater into EVMWorldupdater [#7434](https://github.com/hyperledger/besu/pull/7434)
+- Bump besu-native to 0.9.4 [#7456](https://github.com/hyperledger/besu/pull/7456)
+- Add 'inbound' field to admin_peers JSON-RPC Call [#7461](https://github.com/hyperledger/besu/pull/7461)
 
 
 ### Bug fixes
 - Correct entrypoint in Docker evmtool [#7430](https://github.com/hyperledger/besu/pull/7430)
 - Fix protocol schedule check for devnets [#7429](https://github.com/hyperledger/besu/pull/7429)
 - Fix behaviour when starting in a pre-merge network [#7431](https://github.com/hyperledger/besu/pull/7431)
+- Fix tracing in precompiled contracts when halting for out of gas [#7318](https://github.com/hyperledger/besu/issues/7318)
 
 ## 24.7.1
 

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

@@ -432,7 +432,8 @@ public BesuPluginContextImpl providePluginContext(
       besuPluginContext.addService(PermissioningService.class, permissioningService);
       besuPluginContext.addService(PrivacyPluginService.class, new PrivacyPluginServiceImpl());
 
-      besuPluginContext.registerPlugins(new PluginConfiguration(pluginsPath));
+      besuPluginContext.registerPlugins(
+          new PluginConfiguration.Builder().pluginsDir(pluginsPath).build());
 
       // register built-in plugins
       new RocksDBPlugin().register(besuPluginContext);

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

@@ -64,7 +64,8 @@ void setup() {
   @Test
   public void verifyEverythingGoesSmoothly() {
     assertThat(contextImpl.getRegisteredPlugins()).isEmpty();
-    contextImpl.registerPlugins(new PluginConfiguration(DEFAULT_PLUGIN_DIRECTORY));
+    contextImpl.registerPlugins(
+        PluginConfiguration.builder().pluginsDir(DEFAULT_PLUGIN_DIRECTORY).build());
     assertThat(contextImpl.getRegisteredPlugins()).isNotEmpty();
 
     final Optional<TestPicoCLIPlugin> testPluginOptional =
@@ -86,7 +87,8 @@ public void registrationErrorsHandledSmoothly() {
     System.setProperty("testPicoCLIPlugin.testOption", "FAILREGISTER");
 
     assertThat(contextImpl.getRegisteredPlugins()).isEmpty();
-    contextImpl.registerPlugins(new PluginConfiguration(DEFAULT_PLUGIN_DIRECTORY));
+    contextImpl.registerPlugins(
+        PluginConfiguration.builder().pluginsDir(DEFAULT_PLUGIN_DIRECTORY).build());
     assertThat(contextImpl.getRegisteredPlugins()).isNotInstanceOfAny(TestPicoCLIPlugin.class);
 
     contextImpl.beforeExternalServices();
@@ -104,7 +106,8 @@ public void startErrorsHandledSmoothly() {
     System.setProperty("testPicoCLIPlugin.testOption", "FAILSTART");
 
     assertThat(contextImpl.getRegisteredPlugins()).isEmpty();
-    contextImpl.registerPlugins(new PluginConfiguration(DEFAULT_PLUGIN_DIRECTORY));
+    contextImpl.registerPlugins(
+        PluginConfiguration.builder().pluginsDir(DEFAULT_PLUGIN_DIRECTORY).build());
     assertThat(contextImpl.getRegisteredPlugins())
         .extracting("class")
         .contains(TestPicoCLIPlugin.class);
@@ -129,7 +132,8 @@ public void stopErrorsHandledSmoothly() {
     System.setProperty("testPicoCLIPlugin.testOption", "FAILSTOP");
 
     assertThat(contextImpl.getRegisteredPlugins()).isEmpty();
-    contextImpl.registerPlugins(new PluginConfiguration(DEFAULT_PLUGIN_DIRECTORY));
+    contextImpl.registerPlugins(
+        PluginConfiguration.builder().pluginsDir(DEFAULT_PLUGIN_DIRECTORY).build());
     assertThat(contextImpl.getRegisteredPlugins())
         .extracting("class")
         .contains(TestPicoCLIPlugin.class);
@@ -151,7 +155,9 @@ public void stopErrorsHandledSmoothly() {
   @Test
   public void lifecycleExceptions() throws Throwable {
     final ThrowableAssert.ThrowingCallable registerPlugins =
-        () -> contextImpl.registerPlugins(new PluginConfiguration(DEFAULT_PLUGIN_DIRECTORY));
+        () ->
+            contextImpl.registerPlugins(
+                PluginConfiguration.builder().pluginsDir(DEFAULT_PLUGIN_DIRECTORY).build());
 
     assertThatExceptionOfType(IllegalStateException.class).isThrownBy(contextImpl::startPlugins);
     assertThatExceptionOfType(IllegalStateException.class).isThrownBy(contextImpl::stopPlugins);
@@ -173,7 +179,8 @@ public void lifecycleExceptions() throws Throwable {
 
   @Test
   public void shouldRegisterAllPluginsWhenNoPluginsOption() {
-    final PluginConfiguration config = createConfigurationForAllPlugins();
+    final PluginConfiguration config =
+        PluginConfiguration.builder().pluginsDir(DEFAULT_PLUGIN_DIRECTORY).build();
 
     assertThat(contextImpl.getRegisteredPlugins()).isEmpty();
     contextImpl.registerPlugins(config);
@@ -227,12 +234,33 @@ void shouldThrowExceptionIfExplicitlySpecifiedPluginNotFound() {
     assertThat(contextImpl.getRegisteredPlugins()).isEmpty();
   }
 
-  private PluginConfiguration createConfigurationForAllPlugins() {
-    return new PluginConfiguration(null, DEFAULT_PLUGIN_DIRECTORY);
+  @Test
+  void shouldNotRegisterAnyPluginsIfExternalPluginsDisabled() {
+    PluginConfiguration config =
+        PluginConfiguration.builder()
+            .pluginsDir(DEFAULT_PLUGIN_DIRECTORY)
+            .externalPluginsEnabled(false)
+            .build();
+    contextImpl.registerPlugins(config);
+    assertThat(contextImpl.getRegisteredPlugins().isEmpty()).isTrue();
+  }
+
+  @Test
+  void shouldRegisterPluginsIfExternalPluginsEnabled() {
+    PluginConfiguration config =
+        PluginConfiguration.builder()
+            .pluginsDir(DEFAULT_PLUGIN_DIRECTORY)
+            .externalPluginsEnabled(true)
+            .build();
+    contextImpl.registerPlugins(config);
+    assertThat(contextImpl.getRegisteredPlugins().isEmpty()).isFalse();
   }
 
   private PluginConfiguration createConfigurationForSpecificPlugin(final String pluginName) {
-    return new PluginConfiguration(List.of(new PluginInfo(pluginName)), DEFAULT_PLUGIN_DIRECTORY);
+    return PluginConfiguration.builder()
+        .requestedPlugins(List.of(new PluginInfo(pluginName)))
+        .pluginsDir(DEFAULT_PLUGIN_DIRECTORY)
+        .build();
   }
 
   private Optional<TestPicoCLIPlugin> findTestPlugin(