Add v2 version for rlp project to accomodate new bytes API

Signed-off-by: Luis Pinto <[email protected]>

Author: lu-pinto

rlp/src/main/java/org/apache/tuweni/v2/rlp/AccumulatingRLPWriter.java

@@ -0,0 +1,87 @@
+// Copyright The Tuweni Authors
+// SPDX-License-Identifier: Apache-2.0
+package org.apache.tuweni.v2.rlp;
+
+import static java.util.Objects.requireNonNull;
+import static org.apache.tuweni.v2.rlp.RLP.encodeByteArray;
+import static org.apache.tuweni.v2.rlp.RLP.encodeLength;
+import static org.apache.tuweni.v2.rlp.RLP.encodeNumber;
+
+import org.apache.tuweni.v2.bytes.Bytes;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.function.Consumer;
+
+final class AccumulatingRLPWriter implements RLPWriter {
+
+  private static final int COMBINE_THRESHOLD = 32;
+
+  private ArrayDeque<byte[]> values = new ArrayDeque<>();
+
+  Deque<byte[]> values() {
+    return values;
+  }
+
+  @Override
+  public void writeRLP(Bytes value) {
+    requireNonNull(value);
+    appendBytes(value.toArrayUnsafe());
+  }
+
+  @Override
+  public void writeValue(Bytes value) {
+    requireNonNull(value);
+    writeByteArray(value.toArrayUnsafe());
+  }
+
+  @Override
+  public void writeByteArray(byte[] value) {
+    encodeByteArray(value, this::appendBytes);
+  }
+
+  @Override
+  public void writeByte(byte value) {
+    encodeByteArray(new byte[] {value}, this::appendBytes);
+  }
+
+  @Override
+  public void writeLong(long value) {
+    appendBytes(encodeNumber(value));
+  }
+
+  @Override
+  public void writeList(Consumer<RLPWriter> fn) {
+    requireNonNull(fn);
+    AccumulatingRLPWriter listWriter = new AccumulatingRLPWriter();
+    fn.accept(listWriter);
+    int totalSize = 0;
+    for (byte[] value : listWriter.values) {
+      try {
+        totalSize = Math.addExact(totalSize, value.length);
+      } catch (ArithmeticException e) {
+        throw new IllegalArgumentException(
+            "Combined length of values is too long (> Integer.MAX_VALUE)");
+      }
+    }
+    appendBytes(encodeLength(totalSize, 0xc0));
+    this.values.addAll(listWriter.values);
+  }
+
+  private void appendBytes(byte[] bytes) {
+    if (bytes.length < COMBINE_THRESHOLD) {
+      if (!values.isEmpty()) {
+        byte[] last = values.getLast();
+        if (last.length <= (COMBINE_THRESHOLD - bytes.length)) {
+          byte[] combined = new byte[last.length + bytes.length];
+          System.arraycopy(last, 0, combined, 0, last.length);
+          System.arraycopy(bytes, 0, combined, last.length, bytes.length);
+          values.pollLast();
+          values.add(combined);
+          return;
+        }
+      }
+    }
+    values.add(bytes);
+  }
+}

rlp/src/main/java/org/apache/tuweni/v2/rlp/ByteBufferRLPWriter.java

@@ -0,0 +1,70 @@
+// Copyright The Tuweni Authors
+// SPDX-License-Identifier: Apache-2.0
+package org.apache.tuweni.v2.rlp;
+
+import static java.util.Objects.requireNonNull;
+import static org.apache.tuweni.v2.rlp.RLP.encodeByteArray;
+import static org.apache.tuweni.v2.rlp.RLP.encodeLength;
+import static org.apache.tuweni.v2.rlp.RLP.encodeNumber;
+
+import org.apache.tuweni.v2.bytes.Bytes;
+
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+import java.util.Deque;
+import java.util.function.Consumer;
+
+final class ByteBufferRLPWriter implements RLPWriter {
+
+  private ByteBuffer buffer;
+
+  ByteBufferRLPWriter(ByteBuffer buffer) {
+    this.buffer = buffer;
+  }
+
+  @Override
+  public void writeRLP(Bytes value) {
+    buffer.put(value.toArrayUnsafe());
+  }
+
+  @Override
+  public void writeValue(Bytes value) {
+    encodeByteArray(value.toArrayUnsafe(), buffer::put);
+  }
+
+  @Override
+  public void writeByteArray(byte[] value) {
+    encodeByteArray(value, buffer::put);
+  }
+
+  @Override
+  public void writeByte(byte value) {
+    encodeByteArray(new byte[] {value}, buffer::put);
+  }
+
+  @Override
+  public void writeLong(long value) {
+    buffer.put(encodeNumber(value));
+  }
+
+  @Override
+  public void writeList(Consumer<RLPWriter> fn) {
+    requireNonNull(fn);
+    AccumulatingRLPWriter listWriter = new AccumulatingRLPWriter();
+    fn.accept(listWriter);
+    writeEncodedValuesAsList(listWriter.values());
+  }
+
+  private void writeEncodedValuesAsList(Deque<byte[]> values) {
+    int totalSize = 0;
+    for (byte[] value : values) {
+      try {
+        totalSize = Math.addExact(totalSize, value.length);
+      } catch (ArithmeticException e) {
+        throw new BufferOverflowException();
+      }
+    }
+    buffer.put(encodeLength(totalSize, 0xc0));
+    values.forEach(bytes -> buffer.put(bytes));
+  }
+}