update besu libs; improve gradle build; improve make file stack start up (#674)

Makefile

@@ -36,17 +36,22 @@ start-env: L1_CONTRACT_VERSION:=6
 start-env: SKIP_CONTRACTS_DEPLOYMENT:=false
 start-env: LINEA_PROTOCOL_CONTRACTS_ONLY:=false
 start-env:
-	if [ "$(CLEAN_PREVIOUS_ENV)" = "true" ]; then \
-  		make clean-environment; \
+	@if [ "$(CLEAN_PREVIOUS_ENV)" = "true" ]; then \
+		$(MAKE) clean-environment; \
 	else \
 		echo "Starting stack reusing previous state"; \
 	fi; \
 	mkdir -p tmp/local; \
 	L1_GENESIS_TIME=$(get_future_time) COMPOSE_PROFILES=$(COMPOSE_PROFILES) docker compose -f $(COMPOSE_FILE) up -d; \
+	while [ "$$(docker compose -f $(COMPOSE_FILE) ps -q l1-el-node | xargs docker inspect -f '{{.State.Health.Status}}')" != "healthy" ] || \
+  			[ "$$(docker compose -f $(COMPOSE_FILE) ps -q sequencer | xargs docker inspect -f '{{.State.Health.Status}}')" != "healthy" ]; do \
+  			sleep 2; \
+  			echo "Checking health status of l1-el-node and sequencer..."; \
+  	done
 	if [ "$(SKIP_CONTRACTS_DEPLOYMENT)" = "true" ]; then \
 		echo "Skipping contracts deployment"; \
 	else \
-		make deploy-contracts L1_CONTRACT_VERSION=$(L1_CONTRACT_VERSION) LINEA_PROTOCOL_CONTRACTS_ONLY=$(LINEA_PROTOCOL_CONTRACTS_ONLY); \
+		$(MAKE) deploy-contracts L1_CONTRACT_VERSION=$(L1_CONTRACT_VERSION) LINEA_PROTOCOL_CONTRACTS_ONLY=$(LINEA_PROTOCOL_CONTRACTS_ONLY); \
 	fi
 
 start-l1:

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

@@ -9,3 +9,14 @@ plugins {
   // Apply the application plugin to add support for building a CLI application in Java.
   id 'application'
 }
+
+tasks.distTar {
+  // we don't use the tar distribution
+  onlyIf { false }
+}
+
+tasks.distZip {
+  // we only need the zip distribution to build the docker image
+  // we explicitly call distZip to build the zip distribution
+  enabled = false
+}

coordinator/app/build.gradle

@@ -92,11 +92,6 @@ distributions {
   }
 }
 
-tasks.distTar {
-  // we don't need the tar distribution
-  onlyIf { false }
-}
-
 run {
   workingDir = rootProject.projectDir
   jvmArgs = [

docker/compose-spec-l2-services.yml

@@ -513,13 +513,13 @@ services:
   blobscan-api:
     container_name: blobscan-api
     hostname: blobscan-api
-    image: blossomlabs/blobscan-api:1.1.0
+    image: blossomlabs/blobscan-api:1.3.1
     platform: linux/amd64 # only linux available
     profiles: [ "staterecovery" ]
     ports:
       - "4001:4001"
     env_file: "./config/blobscan/env"
-    restart: no
+    restart: always
     #    healthcheck:
     #      test: [ "CMD", "curl", "-f", "http://localhost:4001/healthcheck" ]
     #      disable: true
@@ -528,7 +528,6 @@ services:
     #      retries: 20
     #      start_period: 5s
     networks:
-      linea:
       l1network:
         ipv4_address: 10.10.10.203
     depends_on:
@@ -549,7 +548,6 @@ services:
     profiles: [ "staterecovery" ]
     env_file: "./config/blobscan/env"
     networks:
-      linea:
       l1network:
         ipv4_address: 10.10.10.204
     restart: always

docker/config/blobscan/env

@@ -22,7 +22,7 @@ BLOBSCAN_API_PORT=4001
 EXTERNAL_API_PORT=4001
 CHAIN_ID=31648428
 DENCUN_FORK_SLOT=0
-LOG_LEVEL=debug
+LOG_LEVEL=warn
 REDIS_URI=redis://redis:6379/1
 # SENTRY_DSN_API=
 BLOB_PROPAGATOR_ENABLED=false

gradle/libs.versions.toml

@@ -19,7 +19,6 @@ restassured = "5.3.0"
 wiremock = "3.0.1"
 
 # Runtime
-besu = "24.12.2"
 blobCompressor = "0.0.4"
 blobShnarfCalculator = "0.0.4"
 bouncycastle = "1.79"

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

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

transaction-exclusion-api/app/build.gradle

@@ -29,8 +29,7 @@ dependencies {
   implementation "com.fasterxml.jackson.core:jackson-databind:${libs.versions.jackson.get()}"
   implementation "com.fasterxml.jackson.module:jackson-module-kotlin:${libs.versions.jackson.get()}"
 
-  implementation "org.hyperledger.besu.internal:core:${libs.versions.besu.get()}"
-  implementation "org.hyperledger.besu:plugin-api:${libs.versions.besu.get()}"
+  implementation(project(":jvm-libs:linea:besu-libs"))
 
   api("io.netty:netty-transport-native-epoll:${libs.versions.netty.get()}:linux-x86_64") {
     because "It enables native transport for Linux."