Merge branch 'main' into main

Author: vaidikcode

.github/workflows/acceptance-tests.yml

@@ -79,7 +79,7 @@ jobs:
           name: test-args-${{ matrix.runner_index }}.txt
           path: '*.txt'
       - name: run acceptance tests
-        run: ./gradlew --max-workers 1 acceptanceTestNotPrivacy `cat gradleArgs.txt` -Dorg.gradle.caching=true
+        run: ./gradlew acceptanceTestNotPrivacy `cat gradleArgs.txt` -Dorg.gradle.caching=true
       - name: Remove downloaded test results
         run: rm -rf tmp/junit-xml-reports-downloaded
       - name: Upload Acceptance Test Results

CHANGELOG.md

@@ -22,6 +22,7 @@
 - Add TLS/mTLS options and configure the GraphQL HTTP service[#7910](https://github.com/hyperledger/besu/pull/7910)
 - Allow plugins to propose transactions during block creation [#8268](https://github.com/hyperledger/besu/pull/8268)
 - Update `eth_getLogs` to return a `Block not found` error when the requested block is not found. [#8290](https://github.com/hyperledger/besu/pull/8290)
+- Improve Conflict Detection in Parallelization by Considering Slots to Reduce False Positives. [#7923](https://github.com/hyperledger/besu/pull/7923)
 ### Bug fixes
 - Upgrade Netty to version 4.1.118 to fix CVE-2025-24970 [#8275](https://github.com/hyperledger/besu/pull/8275)
 - Add missing RPC method `debug_accountRange` to `RpcMethod.java` and implemented its handler. [#8153](https://github.com/hyperledger/besu/issues/8153)

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

@@ -48,6 +48,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -529,8 +530,7 @@ private void killBesuProcess(final String name) {
       return;
     }
 
-    process
-        .descendants()
+    Stream.concat(process.descendants(), Stream.of(process.toHandle()))
         .peek(
             processHandle ->
                 LOG.info("Killing {} process, pid {}", processHandle.info(), processHandle.pid()))

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

@@ -31,7 +31,6 @@
 import org.hyperledger.besu.crypto.KeyPairUtil;
 import org.hyperledger.besu.cryptoservices.KeyPairSecurityModule;
 import org.hyperledger.besu.cryptoservices.NodeKey;
-import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.api.ApiConfiguration;
 import org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.InProcessRpcConfiguration;
@@ -480,7 +479,6 @@ public BesuController provideBesuController(
           .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
           .clock(Clock.systemUTC())
           .storageProvider(storageProvider)
-          .gasLimitCalculator(GasLimitCalculator.constant())
           .evmConfiguration(EvmConfiguration.DEFAULT)
           .maxPeers(25)
           .maxRemotelyInitiatedPeers(15)

acceptance-tests/tests/build.gradle

@@ -12,8 +12,8 @@
  */
 
 plugins {
-  id 'org.web3j' version '4.11.3'
-  id 'org.web3j.solidity' version '0.4.1'
+  id 'org.web3j' version '4.12.2'
+  id 'org.web3j.solidity' version '0.5.2'
 }
 
 web3j { generatedPackageName = 'org.hyperledger.besu.tests.web3j.generated' }

acceptance-tests/tests/shanghai/build.gradle

@@ -1,7 +1,7 @@
 
 plugins {
-  id 'org.web3j' version '4.11.3'
-  id 'org.web3j.solidity' version '0.4.1'
+  id 'org.web3j' version '4.12.2'
+  id 'org.web3j.solidity' version '0.5.2'
 }
 
 jar { enabled = true }

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/AbstractPreexistingNodeTest.java

@@ -48,7 +48,7 @@ protected static void extract(final Path path, final String destDirectory) throw
         new TarArchiveInputStream(
             new GzipCompressorInputStream(new FileInputStream(path.toAbsolutePath().toString())))) {
       TarArchiveEntry entry;
-      while ((entry = fin.getNextTarEntry()) != null) {
+      while ((entry = fin.getNextEntry()) != null) {
         if (entry.isDirectory()) {
           continue;
         }

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bftsoak/BftMiningSoakTest.java

@@ -30,6 +30,7 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -344,6 +345,7 @@ private void stopNode(final BesuNode node) throws InterruptedException {
     Thread.sleep(TEN_SECONDS);
   }
 
+  @AfterEach
   @Override
   public void tearDownAcceptanceTestBase() {
     cluster.stop();

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterNoDiscoveryAcceptanceTest.java

@@ -20,6 +20,7 @@
 import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration;
 import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -44,6 +45,7 @@ public void shouldNotConnectToOtherPeer() {
     fullNode.verify(net.awaitPeerCount(0));
   }
 
+  @AfterEach
   @Override
   public void tearDownAcceptanceTestBase() {
     noDiscoveryCluster.stop();

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterThreadNodeRunnerAcceptanceTest.java

@@ -31,6 +31,7 @@
 
 import java.util.List;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -79,6 +80,7 @@ void shouldMineTransactionsEvenAfterRestart() {
     miner.verify(recipient.balanceEquals(2));
   }
 
+  @AfterEach
   @Override
   public void tearDownAcceptanceTestBase() {
     noDiscoveryCluster.stop();