feat: update build.gradle to org.hyperledger and linea-besu-upstream (#779)

* feat: update build.gradle to org.hyperledger and linea-besu-upstream

* feat: add org.hyperledger as included group in maven repositories url

* feat: update linea-besu-package in compose files for linea-besu-upstream with new plugin releases

buildSrc/src/main/groovy/net.consensys.zkevm.kotlin-common-minimal-conventions.gradle

@@ -24,6 +24,7 @@ repositories {
     url "https://artifacts.consensys.net/public/linea-besu/maven/"
     content {
       includeGroupAndSubgroups('io.consensys')
+      includeGroupAndSubgroups('org.hyperledger')
     }
   }
   maven {

config/coordinator/coordinator-docker-traces-v2-override.config.toml

@@ -15,7 +15,7 @@ eth-api="http://traces-node-v2:8545"
 [traces]
 switch-to-linea-besu=true
 blob-compressor-version="V1_0_1"
-expected-traces-api-version-v2="beta-v1.3-rc4"
+expected-traces-api-version-v2="beta-v2.1-rc4"
 [traces.counters-v2]
 endpoints=["http://traces-node-v2:8545/"]
 request-limit-per-endpoint=1

docker/compose-spec-l1-services.yml

@@ -2,7 +2,7 @@ services:
   l1-el-node:
     container_name: l1-el-node
     hostname: l1-el-node
-    image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-devnet-395ec6d}
+    image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-devnet-547b40e}
     profiles: [ "l1", "debug", "external-to-monorepo" ]
     depends_on:
       l1-node-genesis-generator:

docker/compose-spec-l2-services.yml

@@ -5,7 +5,7 @@ services:
   sequencer:
     hostname: sequencer
     container_name: sequencer
-    image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-devnet-395ec6d}
+    image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-devnet-547b40e}
     profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ]
     ports:
       - "8545:8545"
@@ -82,7 +82,7 @@ services:
   l2-node-besu:
     hostname: l2-node-besu
     container_name: l2-node-besu
-    image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-devnet-395ec6d}
+    image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-devnet-547b40e}
     profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ]
     depends_on:
       sequencer:
@@ -162,7 +162,7 @@ services:
   traces-node-v2:
     hostname: traces-node-v2
     container_name: traces-node-v2
-    image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-devnet-395ec6d}
+    image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-devnet-547b40e}
     profiles: [ "l2", "l2-bc", "debug", "external-to-monorepo" ]
     depends_on:
       sequencer:
@@ -367,7 +367,7 @@ services:
       - l1network
 
   zkbesu-shomei:
-    image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-devnet-395ec6d}
+    image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-devnet-547b40e}
     hostname: zkbesu-shomei
     container_name: zkbesu-shomei
     profiles: [ "l2", "l2-bc", "external-to-monorepo" ]
@@ -583,7 +583,7 @@ services:
         ipv4_address: 10.10.10.205
 
   zkbesu-shomei-sr:
-    image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-devnet-395ec6d}
+    image: consensys/linea-besu-package:${BESU_PACKAGE_TAG:-devnet-547b40e}
     hostname: zkbesu-shomei-sr
     container_name: zkbesu-shomei-sr
     profiles: [ "external-to-monorepo", "staterecovery" ]

finalized-tag-updater/build.gradle

@@ -10,7 +10,7 @@ repositories {
   maven {
     url "https://artifacts.consensys.net/public/linea-besu/maven/"
     content {
-      includeGroupByRegex('io\\.consensys\\..*')
+      includeGroupByRegex('org\\.hyperledger\\..*')
     }
   }
 }
@@ -71,7 +71,7 @@ dependencies {
   implementation ("org.web3j:core:${libs.versions.web3j.get()}") {
     exclude group: 'org.slf4j', module: 'slf4j-nop'
   }
-  testImplementation 'io.consensys.linea-besu:plugin-api:24.11-delivery39'
+  testImplementation 'org.hyperledger.besu:plugin-api:25.2.1-linea1'
   testImplementation 'info.picocli:picocli:4.7.6'
   testImplementation 'io.vertx:vertx-core'
 }

jvm-libs/linea/besu-libs/build.gradle

@@ -3,8 +3,8 @@ plugins {
   id 'java-library'
 }
 
-def besuArtifactGroup="io.consensys.linea-besu"
-def besuVersion="25.2-delivery48"
+def besuArtifactGroup="org.hyperledger.besu"
+def besuVersion="25.2.1-linea1"
 
 dependencies {
   api("${besuArtifactGroup}:besu-datatypes:${besuVersion}") {