Adopt new Tuweni API changes

build.gradle

@@ -23,6 +23,7 @@ targetCompatibility = JavaVersion.VERSION_21
 repositories {
   mavenCentral()
   maven { url "https://artifacts.consensys.net/public/maven/maven/" }
+  mavenLocal()
 }
 
 dependencies {

gradle/versions.gradle

@@ -26,7 +26,7 @@ dependencyManagement {
     dependency 'org.mockito:mockito-core:5.12.0'
 
     dependency 'io.vertx:vertx-core:4.5.9'
-    dependencySet(group: 'io.consensys.tuweni', version: '2.7.0') {
+    dependencySet(group: 'io.consensys.tuweni', version: '2.7.4-EXPERIMENTAL-SNAPSHOT') {
       entry 'tuweni-bytes'
       entry 'tuweni-crypto'
       entry 'tuweni-rlp'

src/main/java/org/ethereum/beacon/discovery/DiscoveryManager.java

@@ -8,7 +8,7 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 
 /**

src/main/java/org/ethereum/beacon/discovery/DiscoveryManagerImpl.java

@@ -18,8 +18,8 @@
 import java.util.stream.Stream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 import org.ethereum.beacon.discovery.message.FindNodeMessage;
 import org.ethereum.beacon.discovery.message.PingMessage;
 import org.ethereum.beacon.discovery.message.TalkReqMessage;

src/main/java/org/ethereum/beacon/discovery/DiscoverySystem.java

@@ -8,7 +8,7 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 import org.ethereum.beacon.discovery.storage.BucketStats;
 

src/main/java/org/ethereum/beacon/discovery/DiscoverySystemBuilder.java

@@ -29,7 +29,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 import org.ethereum.beacon.discovery.liveness.LivenessChecker;
 import org.ethereum.beacon.discovery.liveness.LivenessChecker.Pinger;
 import org.ethereum.beacon.discovery.message.handler.DefaultExternalAddressSelector;

src/main/java/org/ethereum/beacon/discovery/DiscoverySystemImpl.java

@@ -10,8 +10,8 @@
 import java.util.stream.Stream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes32;
 import org.ethereum.beacon.discovery.scheduler.ExpirationSchedulerFactory;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 import org.ethereum.beacon.discovery.storage.BucketStats;

src/main/java/org/ethereum/beacon/discovery/MutableDiscoverySystem.java

@@ -4,7 +4,7 @@
 package org.ethereum.beacon.discovery;
 
 import java.util.List;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 
 public interface MutableDiscoverySystem extends DiscoverySystem {

src/main/java/org/ethereum/beacon/discovery/TalkHandler.java

@@ -4,7 +4,7 @@
 package org.ethereum.beacon.discovery;
 
 import java.util.concurrent.CompletableFuture;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 
 /** The application side TALKREQ messages handler */

src/main/java/org/ethereum/beacon/discovery/liveness/LivenessChecker.java

@@ -11,7 +11,7 @@
 import java.util.concurrent.CompletableFuture;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.database.ExpirationSet;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 

src/main/java/org/ethereum/beacon/discovery/message/DiscoveryMessageDecoder.java

@@ -4,7 +4,7 @@
 
 package org.ethereum.beacon.discovery.message;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.DiscoveryProtocol;
 
 /** Discovery message decoder */

src/main/java/org/ethereum/beacon/discovery/message/DiscoveryV5MessageDecoder.java

@@ -4,7 +4,7 @@
 
 package org.ethereum.beacon.discovery.message;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.DiscoveryProtocol;
 import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
 import org.ethereum.beacon.discovery.util.DecodeException;

src/main/java/org/ethereum/beacon/discovery/message/FindNodeMessage.java

@@ -9,10 +9,10 @@
 
 import com.google.common.base.Objects;
 import java.util.List;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.rlp.RLP;
-import org.apache.tuweni.rlp.RLPReader;
-import org.apache.tuweni.rlp.RLPWriter;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.rlp.RLP;
+import org.apache.tuweni.v2.rlp.RLPReader;
+import org.apache.tuweni.v2.rlp.RLPWriter;
 import org.ethereum.beacon.discovery.util.DecodeException;
 import org.ethereum.beacon.discovery.util.RlpDecodeException;
 import org.ethereum.beacon.discovery.util.RlpUtil;
@@ -74,7 +74,7 @@ public List<Integer> getDistances() {
 
   @Override
   public Bytes getBytes() {
-    return Bytes.concatenate(
+    return Bytes.wrap(
         Bytes.of(getCode().byteCode()),
         RLP.encodeList(
             writer -> {

src/main/java/org/ethereum/beacon/discovery/message/Message.java

@@ -3,7 +3,7 @@
  */
 package org.ethereum.beacon.discovery.message;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.DiscoveryProtocol;
 
 /** Abstract discovery message */

src/main/java/org/ethereum/beacon/discovery/message/NodesMessage.java

@@ -8,8 +8,8 @@
 
 import java.util.List;
 import java.util.Objects;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.rlp.RLP;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.rlp.RLP;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
 import org.ethereum.beacon.discovery.util.RlpUtil;
@@ -58,7 +58,7 @@ public synchronized List<NodeRecord> getNodeRecords() {
 
   @Override
   public Bytes getBytes() {
-    return Bytes.concatenate(
+    return Bytes.wrap(
         Bytes.of(getCode().byteCode()),
         RLP.encodeList(
             writer -> {

src/main/java/org/ethereum/beacon/discovery/message/PingMessage.java

@@ -7,9 +7,9 @@
 import static org.ethereum.beacon.discovery.util.RlpUtil.checkMaxSize;
 
 import com.google.common.base.Objects;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.rlp.RLP;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.rlp.RLP;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.util.RlpUtil;
 
 /**
@@ -47,7 +47,7 @@ public UInt64 getEnrSeq() {
 
   @Override
   public Bytes getBytes() {
-    return Bytes.concatenate(
+    return Bytes.wrap(
         Bytes.of(getCode().byteCode()),
         RLP.encodeList(
             writer -> {

src/main/java/org/ethereum/beacon/discovery/message/PongMessage.java

@@ -9,9 +9,9 @@
 import static org.ethereum.beacon.discovery.util.Utils.isPortValid;
 
 import com.google.common.base.Objects;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.rlp.RLP;
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.rlp.RLP;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.util.RlpDecodeException;
 import org.ethereum.beacon.discovery.util.RlpUtil;
 
@@ -67,7 +67,7 @@ public int getRecipientPort() {
 
   @Override
   public Bytes getBytes() {
-    return Bytes.concatenate(
+    return Bytes.wrap(
         Bytes.of(getCode().byteCode()),
         RLP.encodeList(
             writer -> {

src/main/java/org/ethereum/beacon/discovery/message/TalkReqMessage.java

@@ -7,8 +7,8 @@
 import static org.ethereum.beacon.discovery.util.RlpUtil.checkMaxSize;
 
 import java.util.Objects;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.rlp.RLP;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.rlp.RLP;
 import org.ethereum.beacon.discovery.util.RlpUtil;
 
 /**
@@ -56,7 +56,7 @@ public Bytes getRequest() {
 
   @Override
   public Bytes getBytes() {
-    return Bytes.concatenate(
+    return Bytes.wrap(
         Bytes.of(getCode().byteCode()),
         RLP.encodeList(
             writer -> {

src/main/java/org/ethereum/beacon/discovery/message/TalkRespMessage.java

@@ -7,8 +7,8 @@
 import static org.ethereum.beacon.discovery.util.RlpUtil.checkMaxSize;
 
 import java.util.Objects;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.rlp.RLP;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.rlp.RLP;
 import org.ethereum.beacon.discovery.util.RlpUtil;
 
 /** TALKRESP is the response to TALKREQ. */
@@ -45,7 +45,7 @@ public Bytes getResponse() {
 
   @Override
   public Bytes getBytes() {
-    return Bytes.concatenate(
+    return Bytes.wrap(
         Bytes.of(getCode().byteCode()),
         RLP.encodeList(
             writer -> {

src/main/java/org/ethereum/beacon/discovery/message/V5Message.java

@@ -4,7 +4,7 @@
 
 package org.ethereum.beacon.discovery.message;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.schema.DiscoveryProtocol;
 
 /** Message of V5 discovery protocol version */

src/main/java/org/ethereum/beacon/discovery/message/handler/EnrUpdateTracker.java

@@ -4,7 +4,7 @@
 
 package org.ethereum.beacon.discovery.message.handler;
 
-import org.apache.tuweni.units.bigints.UInt64;
+import org.apache.tuweni.v2.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 import org.ethereum.beacon.discovery.schema.NodeSession;
 

src/main/java/org/ethereum/beacon/discovery/message/handler/PingHandler.java

@@ -5,7 +5,7 @@
 package org.ethereum.beacon.discovery.message.handler;
 
 import java.net.InetSocketAddress;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.message.PingMessage;
 import org.ethereum.beacon.discovery.message.PongMessage;
 import org.ethereum.beacon.discovery.schema.NodeRecord;

src/main/java/org/ethereum/beacon/discovery/message/handler/PongHandler.java

@@ -11,7 +11,7 @@
 import java.util.Optional;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.message.PongMessage;
 import org.ethereum.beacon.discovery.schema.NodeSession;
 

src/main/java/org/ethereum/beacon/discovery/message/handler/TalkReqHandler.java

@@ -7,7 +7,7 @@
 import java.util.concurrent.CompletableFuture;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.TalkHandler;
 import org.ethereum.beacon.discovery.message.TalkReqMessage;
 import org.ethereum.beacon.discovery.message.TalkRespMessage;

src/main/java/org/ethereum/beacon/discovery/network/DatagramToEnvelope.java

@@ -9,7 +9,7 @@
 import io.netty.channel.socket.DatagramPacket;
 import io.netty.handler.codec.MessageToMessageDecoder;
 import java.util.List;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.pipeline.Envelope;
 import org.ethereum.beacon.discovery.pipeline.Field;
 

src/main/java/org/ethereum/beacon/discovery/network/DiscoveryClient.java

@@ -5,7 +5,7 @@
 package org.ethereum.beacon.discovery.network;
 
 import java.net.InetSocketAddress;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 
 /** Discovery client sends outgoing messages */
 public interface DiscoveryClient {

src/main/java/org/ethereum/beacon/discovery/network/IncomingMessageSink.java

@@ -8,7 +8,7 @@
 import io.netty.channel.SimpleChannelInboundHandler;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.pipeline.Envelope;
 import reactor.core.publisher.FluxSink;
 

src/main/java/org/ethereum/beacon/discovery/network/NettyDiscoveryClientImpl.java

@@ -12,7 +12,7 @@
 import java.util.Map;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 
@@ -45,7 +45,7 @@ public void stop() {}
   @Override
   public void send(final Bytes data, final InetSocketAddress destination) {
     final DatagramPacket packet =
-        new DatagramPacket(Unpooled.copiedBuffer(data.toArray()), destination);
+        new DatagramPacket(Unpooled.copiedBuffer(data.toArrayUnsafe()), destination);
     final NioDatagramChannel channel =
         channels.get(InternetProtocolFamily.of(destination.getAddress()));
     if (channel == null) {

src/main/java/org/ethereum/beacon/discovery/packet/BytesSerializable.java

@@ -3,7 +3,7 @@
  */
 package org.ethereum.beacon.discovery.packet;
 
-import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.v2.bytes.Bytes;
 import org.ethereum.beacon.discovery.util.DecodeException;
 
 /** Any class which can be encoded/decoded to/from {@link Bytes} and is backed by {@link Bytes} */

src/main/java/org/ethereum/beacon/discovery/packet/HandshakeMessagePacket.java

@@ -5,9 +5,8 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.crypto.SECP256K1.SecretKey;
+import org.apache.tuweni.v2.bytes.Bytes;
+import org.apache.tuweni.v2.crypto.SECP256K1.SecretKey;
 import org.ethereum.beacon.discovery.message.V5Message;
 import org.ethereum.beacon.discovery.packet.HandshakeMessagePacket.HandshakeAuthData;
 import org.ethereum.beacon.discovery.packet.impl.HandshakeMessagePacketImpl;
@@ -64,16 +63,16 @@ interface HandshakeAuthData extends AuthData {
     static Bytes signId(
         final Bytes challengeData,
         final Bytes ephemeralPubKey,
-        final Bytes32 destNodeId,
+        final Bytes destNodeId,
         final SecretKey homeNodeSecretKey) {
 
-      Bytes32 idSignatureInput =
+      Bytes idSignatureInput =
           CryptoUtil.sha256(
               Bytes.wrap(ID_SIGNATURE_PREFIX, challengeData, ephemeralPubKey, destNodeId));
       return Functions.sign(homeNodeSecretKey, idSignatureInput);
     }
 
-    Bytes32 getSourceNodeId();
+    Bytes getSourceNodeId();
 
     Bytes getIdSignature();
 
@@ -82,8 +81,8 @@ static Bytes signId(
     Optional<NodeRecord> getNodeRecord(final NodeRecordFactory nodeRecordFactory);
 
     default boolean verify(
-        final Bytes challengeData, final Bytes32 homeNodeId, final Bytes remotePublicKey) {
-      final Bytes32 idSignatureInput =
+        final Bytes challengeData, final Bytes homeNodeId, final Bytes remotePublicKey) {
+      final Bytes idSignatureInput =
           CryptoUtil.sha256(
               Bytes.wrap(ID_SIGNATURE_PREFIX, challengeData, getEphemeralPubKey(), homeNodeId));
       return Functions.verifyECDSASignature(getIdSignature(), idSignatureInput, remotePublicKey);