update all dependencies

build.gradle

@@ -21,22 +21,22 @@ buildscript {
   }
 
   dependencies {
-    classpath "org.ajoberstar.grgit:grgit-core:5.2.1"
+    classpath "org.ajoberstar.grgit:grgit-core:5.2.2"
   }
 }
 
 plugins {
-  id 'com.diffplug.spotless' version '6.22.0'
+  id 'com.diffplug.spotless' version '6.25.0'
   id 'net.ltgt.errorprone' version '3.1.0'
   id 'org.springframework.boot' version '3.2.4'
-  id 'io.spring.dependency-management' version '1.1.3'
+  id 'io.spring.dependency-management' version '1.1.4'
   id 'org.gradle.crypto.checksum' version '1.4.0'
-  id 'org.jetbrains.kotlin.jvm' version '1.9.23'
-  id 'org.jetbrains.kotlin.plugin.spring' version '1.9.23'
+  id 'org.jetbrains.kotlin.jvm' version '2.0.0-Beta5'
+  id 'org.jetbrains.kotlin.plugin.spring' version '2.0.0-Beta5'
   id 'org.jetbrains.dokka' version '1.9.20'
   id 'maven-publish'
   id 'se.patrikerdes.use-latest-versions' version '0.2.18'
-  id 'com.github.ben-manes.versions' version '0.49.0'
+  id 'com.github.ben-manes.versions' version '0.51.0'
 }
 
 description = 'A set of libraries and other tools to aid development of blockchain and other decentralized software in Java and other JVM languages'

dependency-versions.gradle

@@ -12,61 +12,62 @@
  */
 dependencyManagement {
   dependencies {
-    dependency('ch.qos.logback:logback-classic:1.4.11')
-    dependency('commons-codec:commons-codec:1.16.0')
-    dependency('commons-net:commons-net:3.9.0')
-    dependency('com.fasterxml.jackson.core:jackson-databind:2.15.2')
-    dependency('com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2')
-    dependency('com.github.jnr:jnr-ffi:2.2.14')
-    dependency('com.github.codemonstur:embedded-redis:1.0.0')
+    dependency('ch.qos.logback:logback-classic:1.5.3')
+    dependency('commons-codec:commons-codec:1.16.1')
+    dependency('commons-net:commons-net:3.10.0')
+    dependency('com.fasterxml.jackson.core:jackson-databind:2.17.0')
+    dependency('com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.0')
+    dependency('com.github.jnr:jnr-ffi:2.2.16')
+    dependency('com.github.codemonstur:embedded-redis:1.4.3')
     dependency('com.google.code.findbugs:jsr305:3.0.2')
-    dependency('com.google.errorprone:error_prone_annotations:2.21.1')
-    dependency('com.google.errorprone:error_prone_core:2.21.1')
-    dependency('com.google.guava:guava:32.1.2-jre')
-    dependency('com.h2database:h2:2.2.220')
+    dependency('com.google.errorprone:error_prone_annotations:2.26.1')
+    dependency('com.google.errorprone:error_prone_core:2.26.1')
+    dependency('com.google.guava:guava:33.1.0-jre')
+    dependency('com.h2database:h2:2.2.224')
     dependency('com.jolbox:bonecp:0.8.0.RELEASE')
-    dependency('com.netflix.concurrency-limits:concurrency-limits-core:0.4.0')
+    dependency('com.netflix.concurrency-limits:concurrency-limits-core:0.5.0')
     dependency('com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0')
-    dependency('com.opentable.components:otj-pg-embedded:1.0.1')
-    dependency('com.squareup.okhttp3:okhttp:5.0.0-alpha.11')
+    dependency('com.opentable.components:otj-pg-embedded:1.0.2')
+    dependency('com.squareup.okhttp3:okhttp:5.0.0-alpha.12')
     dependency('com.winterbe:expekt:0.5.0')
-    dependency('com.zaxxer:HikariCP:5.0.1')
-    dependency('info.picocli:picocli:4.7.4')
-    dependency('io.grpc:grpc-netty-shaded:1.57.2')
-    dependency('net.java.dev.jna:jna:5.13.0')
-    dependency('org.hyperledger.besu:bls12-381:0.8.1')
-    dependency('org.hyperledger.besu:altbn128:0.8.1')
+    dependency('com.zaxxer:HikariCP:5.1.0')
+    dependency('info.picocli:picocli:4.7.5')
+    dependency('io.grpc:grpc-netty-shaded:1.62.2')
+    dependency('net.java.dev.jna:jna:5.14.0')
+    dependency('org.hyperledger.besu:bls12-381:0.8.3')
+    dependency('org.hyperledger.besu:altbn128:0.8.3')
     dependency('org.hyperledger.besu:secp256k1:0.4.3')
-    dependency('org.apache.httpcomponents.client5:httpclient5:5.3-alpha1')
+    dependency('org.apache.httpcomponents.client5:httpclient5:5.4-alpha2')
 
-    dependency('org.springframework:spring-context:6.0.11')
-    dependency('org.springframework.boot:spring-boot:3.1.2')
-    dependency('org.springframework.boot:spring-boot-starter:3.1.2')
-    dependency('org.springframework.boot:spring-boot-starter-thymeleaf:3.1.2')
-    dependency('org.springframework.boot:spring-boot-starter-web:3.1.2')
-    dependency('org.springframework.boot:spring-boot-starter-webflux:3.1.2')
+    dependency('org.springframework:spring-context:6.1.5')
+    dependency('org.springframework.boot:spring-boot:3.2.4')
+    dependency('org.springframework.boot:spring-boot-starter:3.2.4')
+    dependency('org.springframework.boot:spring-boot-starter-thymeleaf:3.2.4')
+    dependency('org.springframework.boot:spring-boot-starter-web:3.2.4')
+    dependency('org.springframework.boot:spring-boot-starter-webflux:3.2.4')
     dependency('org.springframework.boot:spring-boot-starter-tomcat:3.1.2')
 
-    dependency('io.opentelemetry:opentelemetry-api:1.29.0')
+    dependency('io.opentelemetry:opentelemetry-api:1.36.0')
     dependency('io.opentelemetry:opentelemetry-api-metrics:1.10.0-alpha-rc.1')
     dependency('io.opentelemetry:opentelemetry-exporter-otlp-metrics:1.14.0')
-    dependency('io.opentelemetry:opentelemetry-exporter-otlp:1.29.0')
-    dependency('io.opentelemetry:opentelemetry-exporter-prometheus:1.29.0-alpha')
+    dependency('io.opentelemetry:opentelemetry-exporter-otlp:1.36.0')
+    dependency('io.opentelemetry:opentelemetry-exporter-prometheus:1.36.0-alpha')
     dependency('io.opentelemetry:opentelemetry-extension-trace-propagators:1.2.0')
     dependency('io.opentelemetry:opentelemetry-proto:1.7.1-alpha')
-    dependency('io.opentelemetry:opentelemetry-sdk:1.29.0')
-    dependency('io.opentelemetry:opentelemetry-sdk-trace:1.29.0')
-    dependency('io.opentelemetry:opentelemetry-sdk-metrics:1.29.0')
-    dependency('io.opentelemetry:opentelemetry-sdk-testing:1.29.0')
+    dependency('io.opentelemetry:opentelemetry-sdk:1.36.0')
+    dependency('io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.24.0-alpha')
+    dependency('io.opentelemetry:opentelemetry-sdk-trace:1.36.0')
+    dependency('io.opentelemetry:opentelemetry-sdk-metrics:1.36.0')
+    dependency('io.opentelemetry:opentelemetry-sdk-testing:1.36.0')
 
-    dependency('io.opentelemetry:opentelemetry-semconv:1.29.0-alpha')
+    dependency('io.opentelemetry:opentelemetry-semconv:1.30.1-alpha')
     dependency('io.prometheus:simpleclient:0.16.0')
     dependency('io.prometheus:simpleclient_httpserver:0.16.0')
-    dependency('redis.clients:jedis:5.0.0-beta2')
-    dependency('io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.15')
-    dependency('org.webjars:swagger-ui:5.4.2')
+    dependency('redis.clients:jedis:5.2.0-beta1')
+    dependency('io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.21')
+    dependency('org.webjars:swagger-ui:5.13.0')
 
-    dependencySet(group: 'io.vertx', version: '4.4.4') {
+    dependencySet(group: 'io.vertx', version: '4.5.7') {
       entry 'vertx-core'
       entry 'vertx-lang-kotlin'
       entry 'vertx-lang-kotlin-coroutines'
@@ -75,46 +76,46 @@ dependencyManagement {
       entry 'vertx-web-client'
     }
 
-    dependency('jakarta.servlet:jakarta.servlet-api:6.0.0')
+    dependency('jakarta.servlet:jakarta.servlet-api:6.1.0-M2')
     dependency('jakarta.annotation:jakarta.annotation-api:2.1.1')
     dependency('javax.persistence:javax.persistence-api:2.2')
-    dependencySet(group: 'org.antlr', version: '4.13.0') {
+    dependencySet(group: 'org.antlr', version: '4.13.1') {
       entry 'antlr4'
       entry 'antlr4-runtime'
     }
     dependency('javax.ws.rs:javax.ws.rs-api:2.1.1')
-    dependency('org.apache.lucene:lucene-core:9.7.0')
-    dependency('org.apache.openjpa:openjpa:3.2.2')
-    dependency('org.assertj:assertj-core:3.24.2')
+    dependency('org.apache.lucene:lucene-core:9.10.0')
+    dependency('org.apache.openjpa:openjpa:4.0.0')
+    dependency('org.assertj:assertj-core:3.25.3')
     dependencySet(group: 'org.bouncycastle', version: '1.70') {
       entry 'bcpkix-jdk15on'
       entry 'bcprov-jdk15on'
     }
-    dependencySet(group: 'org.eclipse.jetty', version: '11.0.15') {
+    dependencySet(group: 'org.eclipse.jetty', version: '11.0.20') {
       entry 'jetty-server'
       entry 'jetty-servlet'
       entry 'jetty-servlets'
       entry 'jetty-util'
     }
-    dependencySet(group: 'org.glassfish.jersey.core', version: '3.1.3') {
+    dependencySet(group: 'org.glassfish.jersey.core', version: '4.0.0-M1') {
       entry 'jersey-server'
       entry 'jersey-client'
     }
-    dependency('org.glassfish.jersey.containers:jersey-container-servlet:3.1.3')
-    dependency('org.glassfish.jersey.inject:jersey-hk2:3.1.3')
+    dependency('org.glassfish.jersey.containers:jersey-container-servlet:4.0.0-M1')
+    dependency('org.glassfish.jersey.inject:jersey-hk2:4.0.0-M1')
     dependency('org.glassfish.jersey.media:jersey-media-json-jackson:3.0.5')
     dependency('javax.xml.bind:jaxb-api:2.4.0-b180830.0359')
-    dependency('org.flywaydb:flyway-core:9.21.1')
+    dependency('org.flywaydb:flyway-core:10.10.0')
 
     dependency('org.openlabtesting.leveldbjni:leveldbjni-all:1.8')
-    dependencySet(group: 'org.junit.jupiter', version: '5.10.0') {
+    dependencySet(group: 'org.junit.jupiter', version: '5.10.2') {
       entry 'junit-jupiter-api'
       entry 'junit-jupiter-engine'
       entry 'junit-jupiter-params'
       entry 'junit-jupiter-migrationsupport'
     }
-    dependency('org.infinispan:infinispan-core:15.0.0.Dev02')
-    dependency('org.infinispan:infinispan-cachestore-rocksdb:15.0.0.Dev02')
+    dependency('org.infinispan:infinispan-core:15.0.0.Final')
+    dependency('org.infinispan:infinispan-cachestore-rocksdb:15.0.0.Final')
 
 
     dependency('org.jetbrains:annotations:23.1.0')
@@ -123,27 +124,27 @@ dependencyManagement {
       entry 'kotlin-stdlib'
       entry 'kotlin-stdlib-jdk8'
     }
-    dependencySet(group: 'org.jetbrains.kotlinx', version: '1.7.3') {
+    dependencySet(group: 'org.jetbrains.kotlinx', version: '1.8.1-Beta') {
       entry 'kotlinx-coroutines-core'
       entry 'kotlinx-coroutines-jdk8'
     }
     dependencySet(group: 'org.jetbrains.spek', version: '1.1.5') {
       entry 'spek-api'
       entry 'spek-junit-platform-engine'
     }
-    dependency('org.mapdb:mapdb:3.0.9')
+    dependency('org.mapdb:mapdb:3.1.0')
     dependency('org.miracl.milagro.amcl:milagro-crypto-java:0.4.0')
-    dependency('org.mockito:mockito-junit-jupiter:5.4.0')
-    dependency('org.postgresql:postgresql:42.6.0')
+    dependency('org.mockito:mockito-junit-jupiter:5.11.0')
+    dependency('org.postgresql:postgresql:42.7.3')
 
-    dependency('org.rocksdb:rocksdbjni:8.3.2')
-    dependency('org.slf4j:slf4j-api:2.0.7')
+    dependency('org.rocksdb:rocksdbjni:9.0.0')
+    dependency('org.slf4j:slf4j-api:2.1.0-alpha1')
     dependency('org.connid:framework:1.3.2')
     dependency('org.connid:framework-internal:1.3.2')
 
-    dependency('org.webjars:bootstrap:5.3.1')
-    dependency('org.webjars:webjars-locator:0.47')
+    dependency('org.webjars:bootstrap:5.3.3')
+    dependency('org.webjars:webjars-locator:0.52')
 
-    dependency('org.xerial.snappy:snappy-java:1.1.10.3')
+    dependency('org.xerial.snappy:snappy-java:1.1.10.5')
   }
 }

devp2p-proxy/src/main/kotlin/org/apache/tuweni/devp2p/proxy/TcpDownstream.kt

@@ -6,12 +6,11 @@ import io.vertx.core.Vertx
 import io.vertx.core.buffer.Buffer
 import io.vertx.core.net.NetServer
 import io.vertx.core.net.NetSocket
-import io.vertx.kotlin.coroutines.await
+import io.vertx.kotlin.coroutines.coAwait
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import org.apache.tuweni.bytes.Bytes
-import org.apache.tuweni.concurrent.coroutines.await
 import org.slf4j.LoggerFactory
 import kotlin.coroutines.CoroutineContext
 
@@ -34,7 +33,7 @@ class TcpDownstream(
     val server = vertx.createNetServer()
     server.connectHandler {
       handleSocket(it)
-    }.listen(port, host).await()
+    }.listen(port, host).coAwait()
     tcpServer = server
     logger.info("Started downstream proxy server on $host:$port")
   }

devp2p-proxy/src/main/kotlin/org/apache/tuweni/devp2p/proxy/TcpUpstream.kt

@@ -6,6 +6,7 @@ import io.vertx.core.Vertx
 import io.vertx.core.buffer.Buffer
 import io.vertx.core.net.NetClient
 import io.vertx.kotlin.coroutines.await
+import io.vertx.kotlin.coroutines.coAwait
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
@@ -33,7 +34,7 @@ class TcpUpstream(
   }
 
   override suspend fun handleRequest(message: Bytes): Bytes {
-    val socket = tcpclient!!.connect(port, host).await()
+    val socket = tcpclient!!.connect(port, host).coAwait()
 
     val result = AsyncResult.incomplete<Bytes>()
     socket.handler {
@@ -44,7 +45,7 @@ class TcpUpstream(
     }.exceptionHandler {
       result.completeExceptionally(it)
     }
-    socket.write(Buffer.buffer(message.toArrayUnsafe())).await()
+    socket.write(Buffer.buffer(message.toArrayUnsafe())).coAwait()
 
     return result.await()
   }

devp2p/src/main/kotlin/org/apache/tuweni/devp2p/DiscoveryService.kt

@@ -9,6 +9,7 @@ import io.vertx.core.buffer.Buffer
 import io.vertx.core.datagram.DatagramPacket
 import io.vertx.core.net.SocketAddress
 import io.vertx.kotlin.coroutines.await
+import io.vertx.kotlin.coroutines.coAwait
 import io.vertx.kotlin.coroutines.dispatcher
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineExceptionHandler
@@ -335,7 +336,7 @@ internal class CoroutineDiscoveryService constructor(
   }
 
   fun start() = launch {
-    server.handler { receiveDatagram(it) }.listen(bindAddress.port(), bindAddress.host()).await()
+    server.handler { receiveDatagram(it) }.listen(bindAddress.port(), bindAddress.host()).coAwait()
     val endpoint = Endpoint(
       advertiseAddress ?: (server.localAddress()).host(),
       advertiseUdpPort ?: server.localAddress().port(),
@@ -428,7 +429,7 @@ internal class CoroutineDiscoveryService constructor(
   override suspend fun shutdown() {
     if (shutdown.compareAndSet(false, true)) {
       logger.info("{}: shutdown", serviceDescriptor)
-      server.close().await()
+      server.close().coAwait()
       for (pending in awaitingPongs.values) {
         pending.complete(null)
       }
@@ -916,6 +917,6 @@ internal class CoroutineDiscoveryService constructor(
   }
 
   private suspend fun sendPacket(address: SocketAddress, packet: Packet) {
-    server.send(Buffer.buffer(packet.encode().toArrayUnsafe()), address.port(), address.host()).await()
+    server.send(Buffer.buffer(packet.encode().toArrayUnsafe()), address.port(), address.host()).coAwait()
   }
 }

devp2p/src/main/kotlin/org/apache/tuweni/devp2p/PacketType.kt

@@ -6,6 +6,8 @@ import org.apache.tuweni.bytes.Bytes
 import org.apache.tuweni.bytes.Bytes32
 import org.apache.tuweni.crypto.SECP256K1
 
+private const val MAX_VALUE: Byte = 0x7f
+
 /**
  * DevP2P discovery packet types
  * @param typeId the byte representing the type
@@ -86,7 +88,6 @@ internal enum class PacketType(
   }, ;
 
   companion object {
-    private const val MAX_VALUE: Byte = 0x7f
     private val INDEX = arrayOfNulls<PacketType?>(MAX_VALUE.toInt())
 
     init {
@@ -100,7 +101,7 @@ internal enum class PacketType(
   }
 
   init {
-    require(typeId <= PacketType.MAX_VALUE) { "Packet typeId must be in range [0x00, 0x80)" }
+    require(typeId <= MAX_VALUE) { "Packet typeId must be in range [0x00, 0x80)" }
   }
 
   abstract fun decode(

devp2p/src/main/kotlin/org/apache/tuweni/devp2p/v5/DiscoveryV5Service.kt

@@ -7,6 +7,7 @@ import io.vertx.core.buffer.Buffer
 import io.vertx.core.datagram.DatagramPacket
 import io.vertx.core.net.SocketAddress
 import io.vertx.kotlin.coroutines.await
+import io.vertx.kotlin.coroutines.coAwait
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -176,38 +177,38 @@ internal class DefaultDiscoveryV5Service(
   private lateinit var receiveJob: Job
 
   override suspend fun start(): AsyncCompletion {
-    server.handler(this::receiveDatagram).listen(bindAddress.port, bindAddress.hostString).await()
+    server.handler(this::receiveDatagram).listen(bindAddress.port, bindAddress.hostString).coAwait()
     return bootstrap()
   }
 
   override suspend fun terminate() {
     if (started.compareAndSet(true, false)) {
       receiveJob.cancel()
-      server.close().await()
+      server.close().coAwait()
     }
   }
 
   override fun enr(): EthereumNodeRecord = selfEnr
 
   override suspend fun addPeer(enr: EthereumNodeRecord, address: SocketAddress): AsyncCompletion {
     val session = sessions[address]
-    if (session == null) {
+    return if (session == null) {
       logger.trace("Creating new session for peer {}", enr)
       val handshakeSession = handshakes.computeIfAbsent(address) { addr -> createHandshake(addr, enr.publicKey(), enr) }
-      return asyncCompletion {
+      asyncCompletion {
         logger.trace("Handshake connection start {}", enr)
         handshakeSession.connect().await()
         logger.trace("Handshake connection done {}", enr)
       }
     } else {
       logger.trace("Session found for peer {}", enr)
-      return AsyncCompletion.completed()
+      AsyncCompletion.completed()
     }
   }
 
   private fun send(addr: SocketAddress, message: Bytes) {
     launch {
-      server.send(Buffer.buffer(message.toArrayUnsafe()), addr.port(), addr.host()).await()
+      server.send(Buffer.buffer(message.toArrayUnsafe()), addr.port(), addr.host()).coAwait()
     }
   }
 
@@ -227,7 +228,7 @@ internal class DefaultDiscoveryV5Service(
     var session = sessions.get(packet.sender())
     val size = Math.min(Packet.MAX_SIZE, packet.data().length())
     val buffer = ByteBuffer.allocate(size)
-    packet.data().byteBuf.readBytes(buffer)
+    buffer.put(packet.data().bytes)
     buffer.flip()
     val message = Bytes.wrapByteBuffer(buffer)
     if (message.slice(0, 32) == whoAreYouHeader && session != null) {