Update besu version to 25.11 (#10106)

* fix packages renamed

Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>

* fix constructor

Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>

* remove temp exclusions

Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>

---------

Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>

Author: gfukushima

beacon/sync/build.gradle

@@ -26,7 +26,7 @@ dependencies {
     testImplementation testFixtures(project(':infrastructure:metrics'))
     testImplementation testFixtures(project('::networking:eth2'))
     testImplementation testFixtures(project('::networking:p2p'))
-    testImplementation 'org.hyperledger.besu.internal:metrics-core'
+    testImplementation 'org.hyperledger.besu.internal:besu-metrics-core'
 
     integrationTestImplementation testFixtures(project(':infrastructure:bls'))
     integrationTestImplementation testFixtures(project(':ethereum:statetransition'))
@@ -51,7 +51,7 @@ dependencies {
     testFixturesImplementation testFixtures(project(':infrastructure:metrics'))
 
     testFixturesImplementation 'org.mockito:mockito-core'
-    testFixturesImplementation 'org.hyperledger.besu:plugin-api'
-    testFixturesImplementation 'org.hyperledger.besu.internal:metrics-core'
+    testFixturesImplementation 'org.hyperledger.besu:besu-plugin-api'
+    testFixturesImplementation 'org.hyperledger.besu.internal:besu-metrics-core'
     testFixturesImplementation 'com.google.guava:guava'
 }

build.gradle

@@ -987,21 +987,12 @@ subprojects {
     propertyTestRuntimeOnly.extendsFrom testRuntimeOnly
     referenceTestRuntimeOnly.extendsFrom testRuntimeOnly
 
-    // exclude until Besu dependencies start using io.consensys.protocols:jc-kzg-4844
-    implementation {
-      exclude(group: "tech.pegasys", module: "jc-kzg-4844")
-    }
-
     // Details at https://github.com/Hakky54/log-captor#using-log-captor-alongside-with-other-logging-libraries
     testImplementation {
       exclude(group: "org.apache.logging.log4j", module: "log4j-slf4j-impl")
       exclude(group: "org.apache.logging.log4j", module: "log4j-slf4j2-impl")
     }
 
-    // exclude until we update Besu dependencies (https://github.com/Consensys/teku/issues/10060)
-    configureEach {
-      exclude(group: "io.netty", module: "netty-codec-smtp")
-    }
   }
 
   def jarName = project.name

data/publisher/build.gradle

@@ -9,7 +9,7 @@ dependencies {
 
     implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
-    implementation 'org.hyperledger.besu.internal:metrics-core'
+    implementation 'org.hyperledger.besu.internal:besu-metrics-core'
     implementation 'com.squareup.okhttp3:okhttp'
     compileOnly 'com.github.oshi:oshi-core-java11'
 

eth-reference-tests/build.gradle

@@ -22,7 +22,7 @@ dependencies {
   referenceTestImplementation project(':infrastructure:time')
   referenceTestImplementation project(':data:dataexchange')
 
-  referenceTestImplementation 'org.hyperledger.besu:plugin-api'
+  referenceTestImplementation 'org.hyperledger.besu:besu-plugin-api'
   referenceTestImplementation 'com.fasterxml.jackson.core:jackson-databind'
   referenceTestImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
   referenceTestImplementation 'io.consensys.tuweni:tuweni-bytes'

ethereum/performance-trackers/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-  implementation 'org.hyperledger.besu:plugin-api'
+  implementation 'org.hyperledger.besu:besu-plugin-api'
   implementation project(':infrastructure:metrics')
   implementation project(':infrastructure:logging')
   implementation project(':infrastructure:time')

ethereum/spec/build.gradle

@@ -39,11 +39,11 @@ dependencies {
     testFixturesImplementation 'org.apache.logging.log4j:log4j-api'
     testFixturesImplementation 'io.consensys.tuweni:tuweni-units'
     testFixturesImplementation 'io.consensys.tuweni:tuweni-ssz'
-    testFixturesImplementation 'org.hyperledger.besu.internal:core'
-    testFixturesImplementation 'org.hyperledger.besu.internal:config'
+    testFixturesImplementation 'org.hyperledger.besu.internal:besu-ethereum-core'
+    testFixturesImplementation 'org.hyperledger.besu.internal:besu-config'
     testFixturesImplementation 'org.hyperledger.besu:besu-datatypes'
-    testFixturesImplementation 'org.hyperledger.besu:evm'
-    testFixturesImplementation 'org.hyperledger.besu:plugin-api'
+    testFixturesImplementation 'org.hyperledger.besu:besu-evm'
+    testFixturesImplementation 'org.hyperledger.besu:besu-plugin-api'
     testFixturesImplementation 'org.junit.jupiter:junit-jupiter-api'
     testFixturesImplementation project(':ethereum:performance-trackers')
     testFixturesImplementation project(':ethereum:execution-types')
@@ -77,5 +77,5 @@ dependencies {
     testImplementation testFixtures(project(':infrastructure:metrics'))
     testImplementation testFixtures(project(':infrastructure:time'))
 
-    testFixturesImplementation 'org.hyperledger.besu.internal:metrics-core'
+    testFixturesImplementation 'org.hyperledger.besu.internal:besu-metrics-core'
 }

ethereum/spec/src/testFixtures/java/tech/pegasys/teku/spec/datastructures/interop/MergedGenesisTestBuilder.java

@@ -23,6 +23,7 @@
 import org.hyperledger.besu.ethereum.core.MiningConfiguration;
 import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.trie.pathbased.bonsai.cache.CodeCache;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import tech.pegasys.teku.infrastructure.bytes.Bytes20;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
@@ -43,8 +44,10 @@ public static ExecutionPayloadHeader createPayloadForBesuGenesis(
             MiningConfiguration.MINING_DISABLED,
             badBlockManager,
             false,
+            false,
             new NoOpMetricsSystem());
-    final GenesisState genesisState = GenesisState.fromConfig(configFile, protocolSchedule);
+    final GenesisState genesisState =
+        GenesisState.fromConfig(configFile, protocolSchedule, new CodeCache());
     final Block genesisBlock = genesisState.getBlock();
     final BlockHeader header = genesisBlock.getHeader();
 

ethereum/statetransition/build.gradle

@@ -26,7 +26,7 @@ dependencies {
   implementation project(':storage:api')
 
   implementation 'io.consensys.tuweni:tuweni-units'
-  implementation 'org.hyperledger.besu.internal:metrics-core'
+  implementation 'org.hyperledger.besu.internal:besu-metrics-core'
   implementation 'io.libp2p:jvm-libp2p'
 
   testImplementation testFixtures(project(':ethereum:spec'))

gradle/versions.gradle

@@ -147,15 +147,15 @@ dependencyManagement {
 
     dependency 'io.prometheus:prometheus-metrics-bom:1.3.10'
 
-    dependencySet(group: 'org.hyperledger.besu.internal', version: '25.6.0') {
-      entry 'metrics-core'
-      entry 'core'
-      entry 'config'
+    dependencySet(group: 'org.hyperledger.besu.internal', version: '25.11.0') {
+      entry 'besu-metrics-core'
+      entry 'besu-ethereum-core'
+      entry 'besu-config'
     }
-    dependencySet(group: 'org.hyperledger.besu', version: '25.6.0') {
+    dependencySet(group: 'org.hyperledger.besu', version: '25.11.0') {
       entry 'besu-datatypes'
-      entry 'evm'
-      entry 'plugin-api'
+      entry 'besu-evm'
+      entry 'besu-plugin-api'
     }
 
     dependencySet(group: 'org.testcontainers', version: '1.21.3') {

infrastructure/events/build.gradle

@@ -3,7 +3,7 @@ dependencies {
   implementation project(':infrastructure:async')
   implementation project(':infrastructure:subscribers')
 
-  testImplementation 'org.hyperledger.besu.internal:metrics-core'
+  testImplementation 'org.hyperledger.besu.internal:besu-metrics-core'
   testImplementation testFixtures(project(':infrastructure:async'))
 }