Staterecovery - udpate besu package (#586)

* staterecovery: udpate to Besu 25.1-delivery43

* staterecovery: udpate besu package

* staterecovery: remove vertx from Uberjar (not necessary anymore)

* staterecovery: reuse release plugin

* staterecovery: rename

.github/workflows/finalized-tag-updater-github-release.yml

@@ -1,59 +0,0 @@
-name: Github Release for Finalized-Tag-Updater Besu Plugin
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        required: true
-        type: string
-        description: 'Release semantic version: e.g "1.0.0"'
-
-jobs:
-  release:
-    runs-on: [self-hosted, ubuntu-20.04, X64, small]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-
-      # Configure Gradle for optimal use in GiHub Actions, including caching of downloaded dependencies.
-      # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-
-      - name: Clean
-        # ./gradlew clean is necessary because the build is cached
-        # and cause issues with JReleaser
-        run: ./gradlew clean
-
-      - name: Build
-        run: |
-          ./gradlew :finalized-tag-updater:shadowJar -Pversion=v${{inputs.version}}
-
-      - name: Release to GitHub
-        uses: jreleaser/release-action@v2
-        with:
-          arguments: full-release --git-root-search --basedir=${{ github.workspace }}/finalized-tag-updater
-        env:
-          GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN_RELEASE_ACCESS }}
-          JRELEASER_TAG_NAME: finalized-tag-updater-v${{inputs.version}}
-          JRELEASER_PROJECT_VERSION: '0.0.1'
-          JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          JRELEASER_GITHUB_USERNAME: ${{ github.actor }}
-          JRELEASER_GITHUB_EMAIL: ${{ github.actor }}@users.noreply.github.com
-
-      # Persist logs
-      - name: JReleaser release output
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: jreleaser-release
-          path: |
-            build/jreleaser/trace.log
-            build/jreleaser/output.properties

Makefile

@@ -32,8 +32,6 @@ clean-environment:
 		make clean-local-folders
 		docker network prune -f
 		docker volume rm linea-local-dev linea-logs || true # ignore failure if volumes do not exist already
-		# Commented out because it's quite time consuming to download the plugin, but it's useful to remember about it
-		#rm -rf tmp/linea-besu-sequencer/plugins/
 
 start-l1:
 		L1_GENESIS_TIME=$(get_future_time) docker compose -f docker/compose.yml -f docker/compose-local-dev.overrides.yml --profile l1 up -d

docker/compose.yml

@@ -471,7 +471,7 @@ services:
       - l1network
 
   zkbesu-shomei:
-    image: consensys/linea-besu-package:${SEQUENCER_TAG:-devnet-811f30b}
+    image: consensys/linea-besu-package:${SEQUENCER_TAG:-devnet-87bbd7c}
     hostname: zkbesu-shomei
     container_name: zkbesu-shomei
     profiles: [ "l2", "l2-bc", "external-to-monorepo" ]
@@ -697,7 +697,7 @@ services:
         ipv4_address: 10.10.10.205
 
   zkbesu-shomei-sr:
-    image: consensys/linea-besu-package:${SEQUENCER_TAG:-devnet-811f30b}
+    image: consensys/linea-besu-package:${SEQUENCER_TAG:-devnet-87bbd7c}
     hostname: zkbesu-shomei-sr
     container_name: zkbesu-shomei-sr
     profiles: [ "external-to-monorepo", "staterecovery" ]
@@ -728,8 +728,9 @@ services:
       - -c
       - |
         chown -R besu:besu /opt/besu/plugins && \
+        rm /opt/besu/plugins/linea-staterecovery-besu-plugin-v* && \
         ls -lh /opt/besu/plugins && \
-        sed -i '/^CLASSPATH/c\CLASSPATH=/opt/besu/lib/\*' /opt/besu/bin/besu && \
+        sed -i '/^CLASSPATH/c\CLASSPATH=/opt/besu/lib/\*\:/opt/besu/plugins/\*' /opt/besu/bin/besu && \
         /opt/besu/bin/besu \
         --config-file=/var/lib/besu/zkbesu-config.toml \
         --genesis-file=/var/lib/besu/genesis.json \
@@ -748,7 +749,6 @@ services:
       - ./config/zkbesu-shomei/zkbesu-config.toml:/var/lib/besu/zkbesu-config.toml:ro
       - ./config/zkbesu-shomei/log4j-staterecovery.xml:/var/lib/besu/log4j.xml:ro
       - ./config/linea-local-dev-genesis-PoA-besu.json/:/var/lib/besu/genesis.json:ro
-      - ../state-recovery/besu-plugin/build/libs/linea-staterecovery-besu-plugin-SNAPSHOT.jar:/opt/besu/lib/linea-staterecovery-besu-plugin-SNAPSHOT.jar
       - ../state-recovery/besu-plugin/build/libs/linea-staterecovery-besu-plugin-SNAPSHOT.jar:/opt/besu/plugins/linea-staterecovery-besu-plugin-SNAPSHOT.jar
 
   shomei-sr:

finalized-tag-updater/build.gradle

@@ -19,8 +19,6 @@ ext.groupsToIncludeInShadow = [
   "org.jetbrains.kotlin:kotlin-reflect.*",
   "org.jetbrains.kotlinx:kotlinx-datetime.*",
   "tech.pegasys.teku.internal:async",
-  "io.vertx.*",
-  // this can be removed once Besu updates to Vertx 4.12+
   "com.michael-bull.kotlin-result:kotlin-result.*",
   "com.fasterxml.jackson.module:jackson-module-kotlin",
 ]

finalized-tag-updater/jreleaser.yml

@@ -17,7 +17,7 @@ project:
 release:
   github:
     overwrite: true
-    releaseName: 'Finalized Tag Updater'
+    releaseName: 'Finalized Tag Updater {{version}}'
     changelog:
       enabled: false
     commitAuthor:
@@ -28,4 +28,4 @@ distributions:
   finalized-tag-updater:
     type: SINGLE_JAR
     artifacts:
-      - path: 'build/libs/{{tagName}}.jar'
+      - path: 'build/libs/finalized-tag-updater-{{version}}.jar'

gradle/libs.versions.toml

@@ -25,7 +25,7 @@ restassured = "5.3.0"
 teku = "23.1.1"
 tuweni = "2.4.2"
 kotlinResult = "1.1.16"
-vertx = "4.5.0"
+vertx = "4.5.11"
 web3j = "4.12.2"
 wiremock = "3.0.1"
 jsonUnit = "3.4.1"

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

@@ -6,7 +6,7 @@ plugins {
 //def besuArtifactGroup="org.hyperledger.besu"
 //def besuVersion=libs.versions.besu.get()
 def besuArtifactGroup="io.consensys.linea-besu"
-def besuVersion="24.12-develop-2098dd2"
+def besuVersion="25.1-delivery43"
 
 dependencies {
   api("${besuArtifactGroup}:besu-datatypes:${besuVersion}") {

state-recovery/besu-plugin/build.gradle

@@ -27,8 +27,6 @@ ext.groupsToIncludeInShadow = [
   "org.jetbrains.kotlin:kotlin-reflect.*",
   "org.jetbrains.kotlinx:kotlinx-datetime.*",
   "tech.pegasys.teku.internal:async",
-  "io.vertx.*",
-  // this can be removed once Besu updates to Vertx 4.12+
   "com.michael-bull.kotlin-result:kotlin-result.*",
   "com.fasterxml.jackson.module:jackson-module-kotlin",
 ]

state-recovery/besu-plugin/src/main/kotlin/linea/staterecovery/plugin/BlockImporter.kt

@@ -6,9 +6,9 @@ import net.consensys.toBigInteger
 import net.consensys.toULong
 import org.apache.logging.log4j.LogManager
 import org.apache.tuweni.bytes.Bytes32
-import org.hyperledger.besu.datatypes.AccountOverrideMap
 import org.hyperledger.besu.datatypes.Address
 import org.hyperledger.besu.datatypes.Hash
+import org.hyperledger.besu.datatypes.StateOverrideMap
 import org.hyperledger.besu.plugin.data.BlockContext
 import org.hyperledger.besu.plugin.data.BlockHeader
 import org.hyperledger.besu.plugin.data.BlockOverrides
@@ -49,7 +49,7 @@ class BlockImporter(
         parentBlockNumber,
         transactions,
         createOverrides(block),
-        AccountOverrideMap()
+        StateOverrideMap()
       )
 
     log.debug(
@@ -84,7 +84,7 @@ class BlockImporter(
         parentBlockNumber,
         context.blockBody.transactions,
         createOverrides(context.blockHeader),
-        AccountOverrideMap()
+        StateOverrideMap()
       )
     log.debug(
       "simulateAndPersistWorldState result: block={} blockHeader={}",